- Implemented support for the Orthogonal extension into

  both the assembler, and the emulator.

  I finally figured out how I could get support for the
  Ortho extension implemented into the old assembler.

  The only reason for doing this, is to buy me some
  while I start work on the new assembler, and to help
  me get an idea for how to do the same in the new
  assembler.

6 files changed, 13 insertions, 13 deletions

diff --git a/programs/sub-suite/declare.s b/programs/sub-suite/declare.s
index 5828fdb..550228d 100644
--- a/programs/sub-suite/declare.s
+++ b/programs/sub-suite/declare.s
@@ -769,7 +769,7 @@ inst:
 	.byte $81
 
 ; Mnemonic Table.
-mne:
+mnem:
 	.byte "ADC"
 	.byte "AND"
 	.byte "ASR"
@@ -852,9 +852,9 @@ cmd_srt:
 	.word list
 	.word asm
 	.word help
-	.word ins
+	.word inst
 	.word run
-	.word set
+	.word set_val
 
 ; Return table used by get_ctrlidx.
 ct_rtb:
diff --git a/programs/sub-suite/lexer.s b/programs/sub-suite/lexer.s
index 9c3cb87..b2850aa 100644
--- a/programs/sub-suite/lexer.s
+++ b/programs/sub-suite/lexer.s
@@ -434,7 +434,7 @@ ptok_alph:
 	ldb idx1	; Get the instruction ID.
 	cpb #OPNUM	; Have we reached the end of the mnemonic table?
 	beq @end	; Yes, so we're done.
-	lda.w #mne	; No, so get the start of the mnemonic table.
+	lda.w #mnem	; No, so get the start of the mnemonic table.
 	clc		; Prepare for a non carrying add.
 	adc.w idx2	; Offset the pointer, by the length of the previous string.
 	pha.q		; Preserve the mnemonic string pointer.
diff --git a/programs/sub-suite/libc.s b/programs/sub-suite/libc.s
index 3dc9d63..ae35146 100644
--- a/programs/sub-suite/libc.s
+++ b/programs/sub-suite/libc.s
@@ -277,7 +277,7 @@ malloc:
 	bra @retptr	; Return the pointer.
 @sliceblk:
 	ldy #fblk.size	; Get the size of the current block.
-	lda.q (sp+9). y	;
+	lda.q (sp+9), y	;
 	sec		; Prepare for a non borrowing subtract.
 	sbc.q sp+17	; Subtract the current block's size from the passed size.
 	sta.q (sp+9), y	; Set the current block's size to the subtracted size.
@@ -412,7 +412,7 @@ free:
 	cmp.q sp+9	; Is the right pointer NULL?
 	bne @normerge	; No, so don't merge the right block.
 @rmerge:
-	ldy #fblk.size	: Get the size of the right pointer.
+	ldy #fblk.size	; Get the size of the right pointer.
 	lda.q sp+17	; Get the size of the current block.
 	clc		; Prepare for a non carrying add.
 	adc.q (sp+9), y	; Add the size of the current block, with the size of the right pointer.
diff --git a/programs/sub-suite/subasm.s b/programs/sub-suite/subasm.s
index 7b2b8b9..80aaa47 100644
--- a/programs/sub-suite/subasm.s
+++ b/programs/sub-suite/subasm.s
@@ -164,15 +164,15 @@ help:
 	nop		;
 @end:
 	rts		; End of help.
-ins:
+inst:
 	nop		;
 @end:
-	rts		; End of ins.
+	rts		; End of inst.
 run:
 	nop		;
 @end:
 	rts		; End of run.
-set:
+set_val:
 	nop		;
 @end:
-	rts		; End of set.
+	rts		; End of set_val.
diff --git a/programs/sub-suite/subeditor.s b/programs/sub-suite/subeditor.s
index 43768f7..387b5db 100644
--- a/programs/sub-suite/subeditor.s
+++ b/programs/sub-suite/subeditor.s
@@ -693,7 +693,7 @@ shftln:
 	beq @dec_loop	; Yes, so shift, and decrement.
 	ldb #0		; Clear the B register.
 	bra @inc_loop	; No, so shift, and increment.
-@neg:
+@minus:
 	ldy.w zero	; Set the source poition to 0.
 	stb (ptr3), y	; Clear the character that is in the source.
 	bra @end	; We are done.
@@ -711,7 +711,7 @@ shftln:
 	sta (ptr3), y	; Place the character from the source position, to the destination position.
 	ply.w		; Set our position back to the source.
 	stb (ptr3), y	; Clear the character that is in the source.
-	bng @neg	; The source underflowed, so set it back to zero,
+	bng @minus	; The source underflowed, so set it back to zero,
 	dey		; Decrement the source position.
 	dex		; Decrement the destination position.
 	bra @inc_loop	; Keep looping.
diff --git a/programs/sub-suite/subsuite.s b/programs/sub-suite/subsuite.s
index b276209..7b31c31 100644
--- a/programs/sub-suite/subsuite.s
+++ b/programs/sub-suite/subsuite.s
@@ -17,7 +17,7 @@
 .qword reset
 a
 ;l a
-;.org reset+$F50
+;.org reset
 ;v
 ;f "subsuite.bin" $8000
 ;q