sys->cpu->pr += 1;
}
-void addl(WORD r, WORD val)
+void addl_gr(WORD r, WORD val, bool add)
{
- long tmp;
- sys->cpu->fr = 0x0;
+ unsigned long o, s;
- if((tmp = sys->cpu->gr[r] + val) < 0 || tmp > 65535) {
- sys->cpu->fr += OF;
+ o = sys->cpu->gr[r];
+ sys->cpu->fr = 0x0; /* flag initialize */
+
+ if(add == true) {
+ s = o + val;
+ if(s > 0xFFFF) {
+ sys->cpu->fr += OF;
+ }
+ } else {
+ if(o < val) {
+ sys->cpu->fr += OF;
+ }
+ s = o + (~val + 1);
+ if(s > 0xFFFF) {
+ s &= 0xFFFF;
+ }
}
- if(((sys->cpu->gr[r] = (WORD)(tmp & 0xFFFF)) & 0x8000) == 0x8000) {
+ sys->cpu->gr[r] = (WORD)s;
+
+ if((s & 0x8000) == 0x8000) {
sys->cpu->fr += SF;
- } else if(sys->cpu->gr[r] == 0x0) {
+ }
+ else if(s == 0x0) {
sys->cpu->fr += ZF;
}
}
WORD w[2];
w[0] = sys->memory[sys->cpu->pr];
w[1] = sys->memory[sys->cpu->pr + 1];
- addl(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
+ addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), true);
sys->cpu->pr += 2;
}
{
WORD w[1];
w[0] = sys->memory[sys->cpu->pr];
- addl(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
+ addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], true);
sys->cpu->pr += 1;
}
WORD w[2];
w[0] = sys->memory[sys->cpu->pr];
w[1] = sys->memory[sys->cpu->pr + 1];
- addl(get_r_r1(w[0]), ~(get_val_adr_x(w[1], w[0])) + 1);
+ addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), false);
sys->cpu->pr += 2;
}
{
WORD w[1];
w[0] = sys->memory[sys->cpu->pr];
- addl(get_r_r1(w[0]), ~(sys->cpu->gr[get_x_r2(w[0])]) + 1);
+ addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], false);
sys->cpu->pr += 1;
}