mras0 / sasm Goto Github PK

diff --git a/sasm.asm b/sasm.asm
index 1e57006..9766700 100644
--- a/sasm.asm
+++ b/sasm.asm
@@ -833,11 +833,32 @@ Expect:

 ; Get number from Token to AX
 GetTokenNumber:
+               xor dl, dl                                      ; assume no "h" suffix
         cmp word [UToken], '0X'
         je .Hex
-        ; Decimal number
+
+               ; check if it has h suffix though (e.g. "0100h")
         xor ax, ax
         mov bx, UToken
+
+               mov al, [TokenLen]                      ; read length of token
+               add bx, ax                                      ; move past end of token
+               dec bx                                          ; back to point at last char
+               mov al, [bx]                            ; fetch last char of token
+
+               cmp al, 'H'                                     ; has "h" suffix?
+               jne .decimal                            ; if not, treat as decimal
+
+               ; hex number with 'h' suffix
+               inc dl                                          ; don't skip 2 chars for "0x" below
+        mov cl, [TokenLen]                     ; decrement len to process
+               dec cl                                          ; take off the 'h'
+               jmp short .Hex2
+
+.decimal:
+        ; Decimal number
+        mov bx, UToken
+               xor al, al
         xor ch, ch
 .Dec:
         mov cl, [bx]
@@ -858,11 +879,17 @@ GetTokenNumber:
 .Hex:
         mov cl, [TokenLen]
         sub cl, 2
+.Hex2:
         cmp cl, 4
         ja .Error
-        xor ax, ax
+
         mov bx, UToken
+               test dl, dl
+               jnz .noskip0x
         add bx, 2
+.noskip0x:
+
+        xor ax, ax
 .HexCvt:
         shl ax, 1
         shl ax, 1