Skip to content

Commit

Permalink
Bump version number to 1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mras0 committed Aug 23, 2019
1 parent 81bdd2b commit 9b46398
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/))
Expand Down Expand Up @@ -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:
Expand All @@ -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`.
4 changes: 2 additions & 2 deletions boot.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion disktool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions sasm.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9b46398

Please sign in to comment.