andrius
/
stage0
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed incorrect branching in Process_String

This commit is contained in:
Jeremiah Orians 2016-10-01 23:13:16 -04:00
parent bd9646563a
commit df62975409
No known key found for this signature in database
GPG Key ID: 7457821534D2ACCD
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
stage1/M0-macro.s
View File

@ -455,6 +455,7 @@
PUSHR R1 R15 PUSHR R1 R15
PUSHR R2 R15 PUSHR R2 R15
:Process_String_0
;; Get node type ;; Get node type
LOAD32 R1 R0 4 ; Load Type LOAD32 R1 R0 4 ; Load Type
CMPSKIP.E R1 2 ; If not a string CMPSKIP.E R1 2 ; If not a string
@ -462,25 +463,25 @@
;; Its a string ;; Its a string
LOAD32 R1 R0 8 ; Get Text pointer LOAD32 R1 R0 8 ; Get Text pointer
LOAD32 R2 R1 0 ; Get first char of Text LOAD8 R2 R1 0 ; Get first char of Text
;; Deal with ' ;; Deal with '
CMPSKIP.E R2 39 ; If char is not ' CMPSKIP.E R2 39 ; If char is not '
JUMP @Process_String_0 ; Move to next label JUMP @Process_String_1 ; Move to next label
;; Simply use Hex strings as is ;; Simply use Hex strings as is
ADDUI R1 R1 1 ; Move Text pointer by 1 ADDUI R1 R1 1 ; Move Text pointer by 1
STORE32 R1 R0 12 ; Set expression to Text + 1 STORE32 R1 R0 12 ; Set expression to Text + 1
JUMP @Process_String_Done ; And move on JUMP @Process_String_Done ; And move on
:Process_String_0 :Process_String_1
;; Deal with " ;; Deal with "
CALLI R15 @Hexify_String CALLI R15 @Hexify_String
:Process_String_Done :Process_String_Done
LOAD32 R0 R0 0 ; Load Next LOAD32 R0 R0 0 ; Load Next
CMPSKIP.E R0 0 ; If Next isn't NULL CMPSKIP.E R0 0 ; If Next isn't NULL
CALLI R15 @Process_String ; Recurse down list JUMP @Process_String_0 ; Recurse down list
;; Restore registers ;; Restore registers
POPR R2 R15 POPR R2 R15
@ -509,6 +510,7 @@
MOVE R1 R0 ; Prep For Hex32 MOVE R1 R0 ; Prep For Hex32
STORE32 R1 R2 12 ; Set node expression pointer STORE32 R1 R2 12 ; Set node expression pointer
LOAD32 R2 R2 8 ; Load Text pointer into R2 LOAD32 R2 R2 8 ; Load Text pointer into R2
ADDUI R2 R2 1 ; SKip leading "
FALSE R4 ; Set counter for malloc to Zero FALSE R4 ; Set counter for malloc to Zero
;; Main Loop ;; Main Loop