projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
基本情報処理試験のフォルダを変更し、2018年春の分を追加
[YACASL2.git]
/
src
/
exec.c
diff --git
a/src/exec.c
b/src/exec.c
index
3ef778d
..
aea3be7
100644
(file)
--- a/
src/exec.c
+++ b/
src/exec.c
@@
-345,40
+345,34
@@
void suba_r1_r2()
sys->cpu->pr += 1;
}
sys->cpu->pr += 1;
}
-void addl_
subl_flagset(long val
)
+void addl_
gr(WORD r, WORD val, bool add
)
{
{
-
sys->cpu->fr = 0x0
;
+
unsigned long o, s
;
- if(val > 65535) {
- sys->cpu->fr += OF;
- }
- if(((WORD)(val) & 0x8000) == 0x8000) {
- sys->cpu->fr += SF;
- } else if(val == 0x0) {
- sys->cpu->fr += ZF;
- }
-}
-
-void addl(WORD r, WORD val)
-{
- long s;
+ o = sys->cpu->gr[r];
+ sys->cpu->fr = 0x0; /* flag initialize */
- s = sys->cpu->gr[r] + val;
+ 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;
+ }
+ }
sys->cpu->gr[r] = (WORD)s;
sys->cpu->gr[r] = (WORD)s;
- addl_subl_flagset(s);
-}
-
-void subl(WORD r, WORD val)
-{
- long s;
- if((s
= sys->cpu->gr[r] + (~val + 1)) > 0x10
000) {
- s
-= 0x10000
;
+ if((s
& 0x8000) == 0x8
000) {
+ s
ys->cpu->fr += SF
;
}
}
- sys->cpu->gr[r] = (WORD)s;
- addl_subl_flagset(s);
- if(r < val) {
- sys->cpu->fr += OF;
+ else if(s == 0x0) {
+ sys->cpu->fr += ZF;
}
}
}
}
@@
-387,7
+381,7
@@
void addl_r_adr_x()
WORD w[2];
w[0] = sys->memory[sys->cpu->pr];
w[1] = sys->memory[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])
);
+ addl
_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), true
);
sys->cpu->pr += 2;
}
sys->cpu->pr += 2;
}
@@
-395,7
+389,7
@@
void addl_r1_r2()
{
WORD w[1];
w[0] = sys->memory[sys->cpu->pr];
{
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;
}
sys->cpu->pr += 1;
}
@@
-404,7
+398,7
@@
void subl_r_adr_x()
WORD w[2];
w[0] = sys->memory[sys->cpu->pr];
w[1] = sys->memory[sys->cpu->pr + 1];
WORD w[2];
w[0] = sys->memory[sys->cpu->pr];
w[1] = sys->memory[sys->cpu->pr + 1];
-
subl(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]), false
);
sys->cpu->pr += 2;
}
sys->cpu->pr += 2;
}
@@
-412,7
+406,7
@@
void subl_r1_r2()
{
WORD w[1];
w[0] = sys->memory[sys->cpu->pr];
{
WORD w[1];
w[0] = sys->memory[sys->cpu->pr];
-
subl(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])], false
);
sys->cpu->pr += 1;
}
sys->cpu->pr += 1;
}