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

Fix reverse copy off-by-one bug in memcpy

This commit is contained in:
David Schmenk 2014-11-21 20:22:18 -08:00
parent 80646542ee
commit 06c087751b
4 changed files with 24 additions and 19 deletions

View File

@ -167,7 +167,7 @@ const CLOSE_BRACKET_TKN = $DD // ]
// Misc. tokens
//
const COMMA_TKN = $AC // ,
const COMMENT_TKN = $BB // //
//const COMMENT_TKN = $BB // //
//
// Keyword tokens
//
@ -601,10 +601,12 @@ REVCPY ;CLC
LDA ESTKH-2,X
ADC ESTKH-1,X
STA SRCH
INC ESTKH-2,X
DEC DSTH
DEC SRCH
LDY #$FF
LDA ESTKL-2,X
BEQ REVCPYLP
INC ESTKH-2,X
REVCPYLP LDA (SRC),Y
STA (DST),Y
DEY
@ -2568,7 +2570,7 @@ def scan
//
// Skip whitespace
//
while ^scanptr and ^scanptr <= ' '
while ^scanptr == ' '
scanptr = scanptr + 1
loop
tknptr = scanptr
@ -2602,7 +2604,7 @@ def scan
//
// Hexadecimal constant
//
token = INT_TKN//
token = INT_TKN
constval = 0
repeat
scanptr = scanptr + 1
@ -2713,7 +2715,7 @@ def scan
is '/'
if ^(scanptr + 1) == '/'
token = EOL_TKN
scanptr = scanptr + 2
^scanptr = $00
else
token = DIV_TKN
scanptr = scanptr + 1
@ -2775,7 +2777,6 @@ def nextln
else
^instr = 0
^inbuff = 0
scanptr = inbuff
token = DONE_TKN
fin
fin
@ -3504,7 +3505,6 @@ def parse_stmnt
emit_leave
break
is EOL_TKN
is COMMENT_TKN
return TRUE
is ELSE_TKN
is ELSEIF_TKN
@ -3703,7 +3703,6 @@ def parse_vars
until scan <> COMMA_TKN
break
is EOL_TKN
is COMMENT_TKN
return TRUE
otherwise
return FALSE
@ -3751,13 +3750,13 @@ def parse_defs
loop
infunc = FALSE
if token <> END_TKN; return parse_err(@bad_syntax); fin
if scan <> EOL_TKN and token <> COMMENT_TKN; return parse_err(@bad_syntax); fin
if scan <> EOL_TKN; return parse_err(@bad_syntax); fin
if prevstmnt <> RETURN_TKN
emit_const(0)
emit_leave
fin
return TRUE
elsif token == EOL_TKN or token == COMMENT_TKN
elsif token == EOL_TKN
return TRUE
fin
return FALSE

View File

@ -243,10 +243,12 @@ REVCPY ;CLC
LDA ESTKH-2,X
ADC ESTKH-1,X
STA SRCH
INC ESTKH-2,X
DEC DSTH
DEC SRCH
LDY #$FF
LDA ESTKL-2,X
BEQ REVCPYLP
INC ESTKH-2,X
REVCPYLP LDA (SRC),Y
STA (DST),Y
DEY

View File

@ -267,10 +267,12 @@ REVCPY ;CLC
LDA ESTKH-2,X
ADC ESTKH-1,X
STA SRCH
INC ESTKH-2,X
DEC DSTH
DEC SRCH
LDY #$FF
LDA ESTKL-2,X
BEQ REVCPYLP
INC ESTKH-2,X
REVCPYLP LDA (SRC),Y
STA (DST),Y
DEY

View File

@ -244,10 +244,12 @@ REVCPY ;CLC
LDA ESTKH-2,X
ADC ESTKH-1,X
STA SRCH
INC ESTKH-2,X
DEC DSTH
DEC SRCH
LDY #$FF
LDA ESTKL-2,X
BEQ REVCPYLP
INC ESTKH-2,X
REVCPYLP LDA (SRC),Y
STA (DST),Y
DEY