github.com/open-simh.simtools
1
0
Fork 0
mirror of https://github.com/open-simh/simtools.git synced 2026-01-13 23:36:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix/work around a bug in parse_expr().

Browse Source 
There was an obscure bug in parse_expr(), used to evaluate 'if df',
where it could skip past the end of the line marker.

If this happened inside an expanded macro, then after that was the
next line...
In other cases it might be worse.

Now that this is fixed, another check for line end junk can be enabled.
This commit is contained in:
Olaf Seibert 2021-01-23 20:05:50 +01:00
parent 6f1af83101
commit c587587f49
5 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assemble.c
View File

@ -932,7 +932,7 @@ static int assemble(
suppressed
until .ENDC */
}
return 1; /* TODO: CHECK_EOL */
return CHECK_EOL;
case P_IFF:
if (last_cond < 0) {

6
parse.c
View File

@ -64,7 +64,7 @@ int check_eol(
return 1;
}
report(stack->top, "Junk at end of line ('%s')\n", cp);
report(stack->top, "Junk at end of line ('%.20s')\n", cp);
return 0;
}
@ -1072,7 +1072,9 @@ EX_TREE *parse_unary(
get_symbol a second time. */
if (!(label = get_symbol(cp, &cp, &local))) {
cp++; /*JH: eat first char of illegal label, else endless loop on implied .WORD */
if (!EOL(*cp)) {
cp++; /*JH: eat first char of illegal label, else endless loop on implied .WORD */
}
tp = ex_err(NULL, cp); /* Not a valid label. */
return tp;
}

6
tests/test-float.lst.ok
View File

@ -143,11 +143,11 @@
120 000420 172127 140263 addd #-1.4,ac1 ; as float
121
122 ; TODO: let parser check for junk at end of line
test-float.mac:123: ***ERROR Junk at end of line ('5')
test-float.mac:123: ***ERROR Junk at end of line ('5 ; bad: ')
123 000424 170627 000002 absf #2.5 ; bad: operand is destination
test-float.mac:124: ***ERROR Junk at end of line ('5')
test-float.mac:124: ***ERROR Junk at end of line ('5 ; bad: ')
124 000430 170527 000002 tstd #2.5 ; bad: operand is considered FDST by the arch handbook
test-float.mac:125: ***ERROR Junk at end of line ('5')
test-float.mac:125: ***ERROR Junk at end of line ('5 ; bad: junk')
125 000434 174027 000002 stf ac0,#2.5 ; bad: junk at end of line
126 000440 174027 000002 stf ac0,#2 ; doesn't makes sense but MACRO11 allows it
127

41
tests/test-prec.lst.ok
View File

@ -56,17 +56,48 @@
56 000114 000007 .word 1 + ^/ 2 * 3 / ; 1 + 6 = 7
57 000116 000007 .word 1 + ^$ 2 * 3 $ ; 1 + 6 = 7
test-prec.mac:58: ***ERROR Invalid expression
58 000120 000003 000000 000000G .word 1 + ^* 2 * 3 * ; Invalid expression
000126 000000G
58
58 000120 000003 000000 .word 1 + ^* 2 * 3 * ; Invalid expression
59
60 ;;;;;
61 ;
62 ; There was an obscure bug in parse_expr(), used to evaluate 'if df',
63 ; where it could skip past the end of the line marker.
64 ;
65 ; If this happened inside an expanded macro, then after that was the
66 ; next line...
67 ; In other cases it might be worse.
68 ;
69 .macro dirdef name, flags, cond
70 .rad50 /.'name/
71 .byte flags+0, 0
72 .if df cond
73 .globl opcerr
74 .word opcerr
75 .iff
76 .globl name
77 .word name
78 .endc
79 .endm
80
81 000124 dirdef name
1 000124 130461 051010 .rad50 /.name/
2 000130 000 000 .byte +0, 0
3 .if df
4 .globl opcerr
5 .word opcerr
6 .iff
7 .globl name
8 000132 000000G .word name
9 .endc
81
Symbol table
. ******R 001 EXPRES= ****** GX INVALI= ****** GX
. ******R 001 NAME = ****** G
Program sections:
. ABS. 000000 000 (RW,I,GBL,ABS,OVR,NOSAV)
000130 001 (RW,I,LCL,REL,CON,NOSAV)
000134 001 (RW,I,LCL,REL,CON,NOSAV)

23
tests/test-prec.mac
View File

@ -56,3 +56,26 @@
.word 1 + ^/ 2 * 3 / ; 1 + 6 = 7
.word 1 + ^$ 2 * 3 $ ; 1 + 6 = 7
.word 1 + ^* 2 * 3 * ; Invalid expression
;;;;;
;
; There was an obscure bug in parse_expr(), used to evaluate 'if df',
; where it could skip past the end of the line marker.
;
; If this happened inside an expanded macro, then after that was the
; next line...
; In other cases it might be worse.
;
.macro dirdef name, flags, cond
.rad50 /.'name/
.byte flags+0, 0
.if df cond
.globl opcerr
.word opcerr
.iff
.globl name
.word name
.endc
.endm
dirdef name