1
0
mirror of https://github.com/dschmenk/PLASMA.git synced 2024-12-24 15:29:29 +00:00

Clean up address initializers

This commit is contained in:
David Schmenk 2014-11-23 07:56:02 -08:00
parent d46387390b
commit e0ef6a6754

View File

@ -2104,12 +2104,16 @@ def emit_data(vartype, consttype, constval, constsize)
constsize = constsize - 1
loop
else
if vartype == WORD_TYPE
size = 2
emit_word(constval)
else
if vartype & BYTE_TYPE
size = 1
emit_byte(constval)
else
size = 2
if consttype & ADDR_TYPE
emit_addr(constval)
else
emit_word(constval)
fin
fin
fin
return size
@ -2893,7 +2897,7 @@ def parse_constval(valptr, sizeptr)
if mod; return parse_err(@bad_op); fin
break
is CHR_TKN
^valptr = constval
*valptr = constval
^sizeptr = 1
type = BYTE_TYPE
break
@ -2907,46 +2911,23 @@ def parse_constval(valptr, sizeptr)
idptr = id_lookup(tknptr, tknlen)
if !idptr; return parse_err(@bad_cnst); fin
type = idptr->idtype
if type & VAR_TYPE
if type & ADDR_TYPE
if !(mod & 8); return parse_err(@bad_cnst); fin
if idptr=>idval & IS_CTAG
ctag = idptr=>idval & MASK_CTAG
if ctag_tbl:[ctag] & IS_RESOLVED
*valptr = (ctag_tbl:[ctag] & MASK_CTAG) + codebuff
else
return parse_err(@bad_cnst)
fin
else
*valptr = idptr=>idval + codebuff
fin
else
*valptr = idptr=>idval
fin
break
otherwise
return parse_err(@bad_cnst)
wend
if mod & 1
if type == BYTE_TYPE
^valptr = -^valptr
else
*valptr = -*valptr
fin
fin
if mod & 2
if type == BYTE_TYPE
^valptr = ~^valptr
else
*valptr = ~*valptr
fin
fin
if mod & 4
if type == BYTE_TYPE
^valptr = !^valptr
else
*valptr = !*valptr
fin
fin
return type
end
def ispostop