From 9b463983439eacc33b2d70b6f5dc7dbc4049ab4c Mon Sep 17 00:00:00 2001
From: Michael Rasmussen <michaelrasmussen1337@gmail.com>
Date: Fri, 23 Aug 2019 19:24:37 +0200
Subject: [PATCH] Bump version number to 1.1

---
 README.md  | 9 ++++++++-
 boot.asm   | 4 ++--
 disktool.c | 2 +-
 sasm.asm   | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 836be5b..7eee13e 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ RAM is necessary to be useful (though the bootstrapping process runs
 with around 100K you won't be able to edit the larger files).
 
 You can also try out the disk image online at [PCjs
-Machines](https://www.pcjs.org/) (Tested 2019-08-13).
+Machines](https://www.pcjs.org/) (Tested 2019-08-23).
 
 - Find a compatible configuration
   (e.g.  [IBM PC (Model 5150), 256Kb RAM, Color Display](https://www.pcjs.org/devices/pcx86/machine/5150/cga/256kb/))
@@ -109,6 +109,7 @@ Copy required files to the disk:
 
     copy *.asm a:
     copy *.bat a:
+    copy LICENSE.md a:
     copy sasm.com a:
 
 Perform bootstrap:
@@ -135,3 +136,9 @@ insert `short` for `jmp` (`-Wshort`).
 `Disktool` can be used to create FAT12 floppy disk images, install
 bootloaders to them and insert / extract files. Call it without
 arguments to see a list of command line options.
+
+
+### Disasm
+
+Simple disassembler. Serves as test bed for the disassembler in
+`debug.asm`.
diff --git a/boot.asm b/boot.asm
index e31854d..537fad9 100644
--- a/boot.asm
+++ b/boot.asm
@@ -31,7 +31,7 @@ DIR_ENTRY_SIZE   equ 0x20
         jmp short Start     ; Use well known
         nop                 ; instruction sequence
 
-        db 'SDOS 1.0'       ; OEM Name
+        db 'SDOS 1.1'       ; OEM Name
 
         ;
         ; 1440 FD BPB (Overwritten by insboot/disktool)
@@ -268,7 +268,7 @@ ReadSectors:
         mov si, MsgDiskErr
         jmp Error
 
-MsgLoading:    db 'Loading SDOS 1.0', 0
+MsgLoading:    db 'Loading SDOS 1.1', 0
 MsgDiskErr:    db 13, 10, 'Error reading from disk', 0
 MsgBootDskErr: db 13, 10, 'Could not load OS.SYS', 0
 MsgReboot:     db 13, 10, 'Press any key to reboot', 13, 10, 0
diff --git a/disktool.c b/disktool.c
index 9aafcdd..c320de0 100644
--- a/disktool.c
+++ b/disktool.c
@@ -320,7 +320,7 @@ static const U1 DefaultBootCode[] = {
   0x0d,0x0a,0x00
 };
 
-static const U1 OEMName[8] = { 'S', 'D', 'O', 'S', ' ', '1', '.', '0' };
+static const U1 OEMName[8] = { 'S', 'D', 'O', 'S', ' ', '1', '.', '1' };
 
 static const struct BPB DiskBPB_360 = {
     .BytesPerSector    = 512,
diff --git a/sasm.asm b/sasm.asm
index 4384c54..1e57006 100644
--- a/sasm.asm
+++ b/sasm.asm
@@ -1417,7 +1417,7 @@ GetOperand:
         cmp bl, 'R'
         jne .CheckNamedLit
         mov byte [ExplicitSize], 2
-        jmp GetOperandMem
+        jmp short GetOperandMem
 .CheckShort:
         cmp cl, 5
         jne .CheckNamedLit
@@ -3122,7 +3122,7 @@ OutputByte186:
 ;; Constants
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-MsgHello:         db 'SASM 1.0 Processing ', 0
+MsgHello:         db 'SASM 1.1 Processing ', 0
 MsgHello2:        db ' to ', 0
 MsgCurToken:      db 'Current token: "', 0
 MsgErrInLine:     db 'Error in line ', 0