6502/PLASMA
1
0
Fork 0
mirror of https://github.com/dschmenk/PLASMA.git synced 2025-07-03 01:23:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51 from iflan/addressing

Browse Source 
Prefer pointer types in prefix operator parsing
This commit is contained in:
David Schmenk
2018-11-18 07:53:08 -08:00
committed by GitHub
parent 4b03b371b6 ce0b92bf8c
commit 522703b278
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/toolsrc/parse.c
View File

@ -651,9 +651,13 @@ t_opseq *parse_value(t_opseq *codeseq, int rvalue, int *stackdepth)
cfnparms = 0; cfnvals = 1; cfnparms = 0; cfnvals = 1;
type &= ~FUNC_TYPE; type &= ~FUNC_TYPE;
} }
else if (type & (BYTE_TYPE | BPTR_TYPE)) else if (type & (BPTR_TYPE)) // Prefer the pointer type.
valseq = gen_lb(valseq); valseq = gen_lb(valseq);
else if (type & (WORD_TYPE | WPTR_TYPE)) else if (type & (WPTR_TYPE))
valseq = gen_lw(valseq);
else if (type & (BYTE_TYPE))
valseq = gen_lb(valseq);
else if (type & (WORD_TYPE))
valseq = gen_lw(valseq); valseq = gen_lw(valseq);
else else
parse_error("What are we dereferencing?"); parse_error("What are we dereferencing?");

8
src/toolsrc/parse.pla
View File

@ -461,9 +461,13 @@ def parse_value(codeseq, r_val)#2
valseq = gen_op(valseq, ICAL_CODE) valseq = gen_op(valseq, ICAL_CODE)
stackdepth = stackdepth + cfnvals - 1 stackdepth = stackdepth + cfnvals - 1
type = type & ~FUNC_TYPE type = type & ~FUNC_TYPE
elsif type & (BYTE_TYPE | BPTR_TYPE) elsif type & (BPTR_TYPE) // Prefer the pointer type.
valseq = gen_op(valseq, LB_CODE) valseq = gen_op(valseq, LB_CODE)
elsif type & (WORD_TYPE | WPTR_TYPE) elsif type & (WPTR_TYPE)
valseq = gen_op(valseq, LW_CODE)
elsif type & (BYTE_TYPE)
valseq = gen_op(valseq, LB_CODE)
elsif type & (WORD_TYPE)
valseq = gen_op(valseq, LW_CODE) valseq = gen_op(valseq, LW_CODE)
else else
exit_err(ERR_INVAL|ERR_CODE) exit_err(ERR_INVAL|ERR_CODE)