Skip to content

Commit 0582638

Browse files
committed
fix some more arch-spc700 phantom errors
1 parent 5e0cdba commit 0582638

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/asar/arch-spc700.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,10 +343,10 @@ bool asblock_spc700(char** word, int numwords)
343343
else { write1((unsigned int)opcode2); write2(getnum_ck(math)); } return true; } while(0)
344344
#define w11(opcode, math1, math2) do { write1((unsigned int)opcode); write1(getnum_ck(math1)); write1(getnum_ck(math2)); return true; } while(0)
345345
#define wr(opcode, math) do { int len=getlen(math); int num=(int)getnum_ck(math); int pos=(len==1)?num:num-(snespos+2); \
346-
if (pass && foundlabel && (pos<-128 || pos>127)) asar_throw_error(2, error_type_block, error_id_relative_branch_out_of_bounds, dec(pos).data()); \
346+
if (pass==2 && foundlabel && (pos<-128 || pos>127)) asar_throw_error(2, error_type_block, error_id_relative_branch_out_of_bounds, dec(pos).data()); \
347347
write1((unsigned int)opcode); write1((unsigned int)pos); return true; } while(0)
348348
#define w1r(opcode, math1, math2) do { int len=getlen(math2); int num=(int)getnum_ck(math2); int pos=(len==1)?num:num-(snespos+3); \
349-
if (pass && foundlabel && (pos<-128 || pos>127)) asar_throw_error(2, error_type_block, error_id_relative_branch_out_of_bounds, dec(pos).data()); \
349+
if (pass==2 && foundlabel && (pos<-128 || pos>127)) asar_throw_error(2, error_type_block, error_id_relative_branch_out_of_bounds, dec(pos).data()); \
350350
write1((unsigned int)opcode); write1(getnum_ck(math1)); write1((unsigned int)pos); return true; } while(0)
351351
string s1;
352352
string s2;
@@ -370,7 +370,7 @@ bool asblock_spc700(char** word, int numwords)
370370
}
371371
int pos = (getnum_ck(arg[1])- (unsigned int)(snespos)-3);
372372
if (pass==2 && (pos<-128 || pos>127)) {
373-
asar_throw_error(1, error_type_block, error_id_relative_branch_out_of_bounds, dec(pos).data());
373+
asar_throw_error(2, error_type_block, error_id_relative_branch_out_of_bounds, dec(pos).data());
374374
}
375375
if(0);
376376
else if (isop("bbs")) write1((unsigned int)(0x03|(bits<<5)));

0 commit comments

Comments
 (0)