6502/PLASMA
1
0
Fork 0
mirror of https://github.com/dschmenk/PLASMA.git synced 2025-07-18 09:24:09 +00:00
Code Issues Projects Releases Wiki Activity

More work on for/next

Browse Source
This commit is contained in:
David Schmenk
2018-03-04 13:15:02 -08:00
parent 2b2e464c9b
commit 5b41fd07c4
7 changed files with 132 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/samplesrc/rogue.combat.pla
View File

@@ -162,7 +162,7 @@ export def fight(player, enemy)
if toupper(conio:getkey()) == 'R'
conio:echo(ECHO_OFF)
return 1
else
fin
//
// Turn player in random direction
//
@@ -193,7 +193,6 @@ export def fight(player, enemy)
fin
if enemy=>prev_other
enemy=>prev_other=>next_other = enemy=>next_other
fin
fin
if player->health > e_atck
player->health = player->health - e_atck

25
src/toolsrc/codegen.c
View File

@@ -798,37 +798,37 @@ void emit_brne(int tag)
void emit_brgt(int tag)
{
emit_pending_seq();
printf("\t%s\t$88\t\t\t; BRGT\t_B%03d\n", DB, tag);
printf("\t%s\t$80\t\t\t; BRGT\t_B%03d\n", DB, tag);
printf("\t%s\t_B%03d-*\n", DW, tag);
}
void emit_brlt(int tag)
{
emit_pending_seq();
printf("\t%s\t$8A\t\t\t; BRLT\t_B%03d\n", DB, tag);
printf("\t%s\t_B%03d-*\n", DW, tag);
}
void emit_addbrle(int tag)
{
emit_pending_seq();
printf("\t%s\t$80\t\t\t; BRLE\t_B%03d\n", DB, tag);
printf("\t%s\t$82\t\t\t; BRLT\t_B%03d\n", DB, tag);
printf("\t%s\t_B%03d-*\n", DW, tag);
}
void emit_incbrle(int tag)
{
emit_pending_seq();
printf("\t%s\t$82\t\t\t; INCBRLE\t_B%03d\n", DB, tag);
printf("\t%s\t$84\t\t\t; INCBRLE\t_B%03d\n", DB, tag);
printf("\t%s\t_B%03d-*\n", DW, tag);
}
void emit_subbrge(int tag)
void emit_addbrle(int tag)
{
emit_pending_seq();
printf("\t%s\t$84\t\t\t; BRGE\t_B%03d\n", DB, tag);
printf("\t%s\t$86\t\t\t; BRLE\t_B%03d\n", DB, tag);
printf("\t%s\t_B%03d-*\n", DW, tag);
}
void emit_decbrge(int tag)
{
emit_pending_seq();
printf("\t%s\t$86\t\t\t; DECBRGE\t_B%03d\n", DB, tag);
printf("\t%s\t$88\t\t\t; DECBRGE\t_B%03d\n", DB, tag);
printf("\t%s\t_B%03d-*\n", DW, tag);
}
void emit_subbrge(int tag)
{
emit_pending_seq();
printf("\t%s\t$8A\t\t\t; BRGE\t_B%03d\n", DB, tag);
printf("\t%s\t_B%03d-*\n", DW, tag);
}
void emit_call(int tag, int type)
@@ -1277,6 +1277,7 @@ int crunch_seq(t_opseq **seq, int pass)
op->code = SUBI_CODE;
freeops = 1;
}
break;
case BINARY_CODE(AND_TOKEN):
if (op->val >= 0 && op->val <= 255)
{

7
src/toolsrc/codegen.pla
View File

@@ -405,9 +405,10 @@ def idmatch(nameptr, len, idptr, idcnt)
while idcnt
if len == idptr->idname
for i = 1 to len
if nameptr->[i - 1] <> idptr->idname.[i]; break; fin
next
i = 1; while i <= len and nameptr->[i - 1] == idptr->idname.[i]; i++; loop
//for i = 1 to len
// if nameptr->[i - 1] <> idptr->idname.[i]; break; fin
//next
if i > len; return idptr; fin
fin
idptr = idptr + idptr->idname + t_id

11
src/toolsrc/lex.pla
View File

@@ -36,11 +36,12 @@ def keymatch
loop
chrptr = tknptr - 1
while keywrds[keypos] == tknlen
for i = 1 to tknlen
if ^(chrptr + i) <> keywrds[keypos + i]
break
fin
next
i = 1; while i <= tknlen and ^(chrptr + i) == keywrds[keypos + i]; i++; loop
//for i = 1 to tknlen
// if ^(chrptr + i) <> keywrds[keypos + i]
// break
// fin
//next
if i > tknlen
return keywrds[keypos + keywrds[keypos] + 1]
fin

1
src/toolsrc/parse.pla
View File

@@ -773,7 +773,6 @@ def parse_stmnt
emit_decbrge(tag_for)
fin
fin
emit_tag(break_tag)
break_tag = tag_prevbrk
stack_loop = stack_loop - 2

40
src/vmsrc/apple/plvm02.s
View File

@@ -203,7 +203,8 @@ OPTBL !WORD ZERO,ADD,SUB,MUL,DIV,MOD,INCR,DECR ; 00 02 04 06 08
!WORD BRNCH,BRNE,CALL,ICAL,ENTER,LEAVE,RET,CFFB ; 50 52 54 56 58 5A 5C 5E
!WORD LB,LW,LLB,LLW,LAB,LAW,DLB,DLW ; 60 62 64 66 68 6A 6C 6E
!WORD SB,SW,SLB,SLW,SAB,SAW,DAB,DAW ; 70 72 74 76 78 7A 7C 7E
!WORD ADDBRLE,INCBRLE,SUBBRGE,DECBRGE,BRGT,BRLT ; 80 82 84 86 88 8A 8C 8E
!WORD BRGT,BRLT,INCBRLE,ADDBRLE,DECBRGE,SUBBRGE ; 80 82 84 86 88 8A 8C 8E
;*
;*
;* ENTER INTO BYTECODE INTERPRETER
;*
@@ -413,7 +414,7 @@ OPXTBL !WORD ZERO,ADD,SUB,MUL,DIV,MOD,INCR,DECR ; 00 02 04 06 08
!WORD BRNCH,BRNE,CALLX,ICALX,ENTER,LEAVEX,RETX,CFFB ; 50 52 54 56 58 5A 5C 5E
!WORD LBX,LWX,LLBX,LLWX,LABX,LAWX,DLB,DLW ; 60 62 64 66 68 6A 6C 6E
!WORD SB,SW,SLB,SLW,SAB,SAW,DAB,DAW ; 70 72 74 76 78 7A 7C 7E
!WORD ADDBRLE,INCBRLE,SUBBRGE,DECBRGE,BRGT,BRLT ; 80 82 84 86 88 8A 8C 8E
!WORD BRGT,BRLT,INCBRLE,ADDBRLE,DECBRGE,SUBBRGE ; 80 82 84 86 88 8A 8C 8E
;*
;* ADD TOS TO TOS-1
;*
@@ -710,6 +711,17 @@ LOR LDA ESTKL,X
STA ESTKH+1,X
+ JMP DROP
;*
;* LOGICAL NOT
;*
LNOT LDA ESTKL,X
ORA ESTKH,X
BEQ +
LDA #$FF
+ EOR #$FF
STA ESTKL,X
STA ESTKH,X
JMP NEXTOP
;*
;* DUPLICATE TOS
;*
DUP DEX
@@ -719,17 +731,6 @@ DUP DEX
STA ESTKH,X
JMP NEXTOP
;*
;* LOGICAL NOT
;*
LNOT LDA ESTKL,X
ORA ESTKH,X
BEQ +
LDA #$00
+ EOR #$FF
STA ESTKL,X
STA ESTKH,X
JMP NEXTOP
;*
;* CONSTANT
;*
ZERO
@@ -1385,13 +1386,12 @@ BRLT LDA ESTKL,X
BNE BRNCH ; BMI BRNCH
+ BMI NOBRNCH
BPL -
DECBRGE LDA ESTKL,X
SEC
SBC #$01
STA ESTKL,X
BCS +
DECBRGE DEC ESTKL,X
LDA ESTKL,X
CMP #$FF
BNE +
DEC ESTKH,X
_BRGE LDA ESTKL,X ; BRGE
_BRGE LDA ESTKL,X
+ CMP ESTKL+1,X
LDA ESTKH,X
SBC ESTKH+1,X
@@ -1403,7 +1403,7 @@ _BRGE LDA ESTKL,X ; BRGE
INCBRLE INC ESTKL,X
BNE _BRLE
INC ESTKH,X
_BRLE LDA ESTKL+1,X ; BRLE
_BRLE LDA ESTKL+1,X
CMP ESTKL,X
LDA ESTKH+1,X
SBC ESTKH,X

95
src/vmsrc/plvm.c
View File

@@ -526,6 +526,7 @@ OPTBL: DW ZERO,ADD,SUB,MUL,DIV,MOD,INCR,DECR ; 00 02 04 06 08 0A 0C 0
DW LB,LW,LLB,LLW,LAB,LAW,DLB,DLW ; 60 62 64 66 68 6A 6C 6E
DW SB,SW,SLB,SLW,SAB,SAW,DAB,DAW ; 70 72 74 76 78 7A 7C 7E
DW ADDBRLE,INCBRLE,SUBBRGE,DECBRGE,BRGT,BRLT ; 80 82 84 86 88 8A 8C 8E
DW BRGT,BRLT,INCBRLE,ADDBRLE,DECBRGE,SUBBRGE ; 80 82 84 86 88 8A 8C 8E
*/
void interp(code *ip)
{
@@ -884,7 +885,47 @@ void interp(code *ip)
/*
* 0x80-0x8F
*/
case 0x80: // ADDBRLE : TOS = TOS + TOS-1
case 0x80: // BRGT : TOS-1 > TOS ? IP += (IP)
val = POP;
if (TOS < val)
{
POP;
ip += WORD_PTR(ip);
}
else
{
PUSH(val);
ip += 2;
}
break;
case 0x82: // BRLT : TOS-1 < TOS ? IP += (IP)
val = POP;
if (TOS > val)
{
POP;
ip += WORD_PTR(ip);
}
else
{
PUSH(val);
ip += 2;
}
break;
case 0x84: // INCBRLE : TOS = TOS + 1
val = POP;
val++;
if (TOS >= val)
{
PUSH(val);
ip += WORD_PTR(ip);
}
else
{
POP;
ip += 2;
}
break;
case 0x86: // ADDBRLE : TOS = TOS + TOS-1
val = POP;
ea = POP;
val = ea + val;
@@ -899,36 +940,7 @@ void interp(code *ip)
ip += 2;
}
break;
case 0x82: // INCBRLE : TOS = TOS + 1
val = POP;
val++;
if (TOS >= val)
{
PUSH(val);
ip += WORD_PTR(ip);
}
else
{
POP;
ip += 2;
}
break;
case 0x84: // SUBBRGE : TOS = TOS-1 - TOS
val = POP;
ea = POP;
val = ea - val;
if (TOS <= val)
{
PUSH(val);
ip += WORD_PTR(ip);
}
else
{
POP;
ip += 2;
}
break;
case 0x86: // DECBRGE : TOS = TOS - 1
case 0x88: // DECBRGE : TOS = TOS - 1
val = POP;
val--;
if (TOS <= val)
@@ -942,29 +954,18 @@ void interp(code *ip)
ip += 2;
}
break;
case 0x88: // BRGT : TOS-1 > TOS ? IP += (IP)
case 0x8A: // SUBBRGE : TOS = TOS-1 - TOS
val = POP;
if (TOS < val)
ea = POP;
val = ea - val;
if (TOS <= val)
{
POP;
PUSH(val);
ip += WORD_PTR(ip);
}
else
{
PUSH(val);
ip += 2;
}
break;
case 0x8A: // BRLT : TOS-1 < TOS ? IP += (IP)
val = POP;
if (TOS > val)
{
POP;
ip += WORD_PTR(ip);
}
else
{
PUSH(val);
ip += 2;
}
break;