projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ソースの推敲
[YACASL2.git]
/
src
/
exec.c
diff --git
a/src/exec.c
b/src/exec.c
index
8b5047e
..
5d4e191
100644
(file)
--- a/
src/exec.c
+++ b/
src/exec.c
@@
-85,14
+85,6
@@
static CERR cerr_exec[] = {
{ 209, "SVC output - memory overflow" },
};
{ 209, "SVC output - memory overflow" },
};
-/**
- * @brief アセンブル結果読み込みエラーの定義
- */
-static CERR cerr_load[] = {
- { 210, "load - memory overflow" },
- { 211, "object file not specified" },
-};
-
/**
* @brief 実行モード: trace, logical, dump, dump_start, dump_end, monitor, step
*/
/**
* @brief 実行モード: trace, logical, dump, dump_start, dump_end, monitor, step
*/
@@
-169,8
+161,8
@@
void setfr(WORD adr)
WORD get_r_r1(WORD oprx)
{
WORD get_r_r1(WORD oprx)
{
- WORD r;
- char *s;
+ WORD r
= 0
;
+ char *s
= NULL
;
if((r = ((oprx & 0x00F0) >>4)) > GRSIZE - 1) {
setcerr(205, s = pr2str(sys->cpu->pr)); /* r/r1 in word #1 - not GR */
if((r = ((oprx & 0x00F0) >>4)) > GRSIZE - 1) {
setcerr(205, s = pr2str(sys->cpu->pr)); /* r/r1 in word #1 - not GR */
@@
-182,8
+174,8
@@
WORD get_r_r1(WORD oprx)
WORD get_x_r2(WORD oprx)
{
WORD get_x_r2(WORD oprx)
{
- WORD x;
- char *s;
+ WORD x
= 0
;
+ char *s
= NULL
;
if((x = (oprx & 0x000F)) > GRSIZE - 1) {
setcerr(206, s = pr2str(sys->cpu->pr)); /* r/r1 in word #1 - not GR */
if((x = (oprx & 0x000F)) > GRSIZE - 1) {
setcerr(206, s = pr2str(sys->cpu->pr)); /* r/r1 in word #1 - not GR */
@@
-195,8
+187,10
@@
WORD get_x_r2(WORD oprx)
WORD get_adr_x(WORD adr, WORD oprx)
{
WORD get_adr_x(WORD adr, WORD oprx)
{
- WORD a = adr, x;
- if((x = get_x_r2(oprx)) > 0) {
+ WORD a = adr;
+ WORD x = get_x_r2(oprx);
+
+ if(x > 0) {
a += sys->cpu->gr[x];
}
return a;
a += sys->cpu->gr[x];
}
return a;
@@
-204,8
+198,8
@@
WORD get_adr_x(WORD adr, WORD oprx)
WORD get_val_adr_x(WORD adr, WORD oprx)
{
WORD get_val_adr_x(WORD adr, WORD oprx)
{
- WORD a;
- char *s;
+ WORD a
= 0
;
+ char *s
= NULL
;
if((a = get_adr_x(adr, oprx)) >= sys->memsize) {
setcerr(207, s = pr2str(sys->cpu->pr + 1)); /* address in word #2 - out of memory */
if((a = get_adr_x(adr, oprx)) >= sys->memsize) {
setcerr(207, s = pr2str(sys->cpu->pr + 1)); /* address in word #2 - out of memory */
@@
-216,11
+210,6
@@
WORD get_val_adr_x(WORD adr, WORD oprx)
}
/* exec.hで定義された関数群 */
}
/* exec.hで定義された関数群 */
-void addcerrlist_load()
-{
- addcerrlist(ARRAYSIZE(cerr_load), cerr_load);
-}
-
void addcerrlist_exec()
{
addcerrlist(ARRAYSIZE(cerr_exec), cerr_exec);
void addcerrlist_exec()
{
addcerrlist(ARRAYSIZE(cerr_exec), cerr_exec);
@@
-228,8
+217,8
@@
void addcerrlist_exec()
WORD loadassemble(const char *file, WORD start)
{
WORD loadassemble(const char *file, WORD start)
{
- FILE *fp;
- WORD end;
+ FILE *fp
= NULL
;
+ WORD end
= 0
;
assert(file != NULL);
if((fp = fopen(file, "rb")) == NULL) {
assert(file != NULL);
if((fp = fopen(file, "rb")) == NULL) {
@@
-252,35
+241,28
@@
void nop()
void ld_r_adr_x()
{
void ld_r_adr_x()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
setfr(sys->cpu->gr[get_r_r1(w[0])] = get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void ld_r1_r2()
{
setfr(sys->cpu->gr[get_r_r1(w[0])] = get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void ld_r1_r2()
{
- WORD w[1];
- w[0] = sys->memory[sys->cpu->pr];
+ WORD w[] = {sys->memory[sys->cpu->pr]};
setfr(sys->cpu->gr[get_r_r1(w[0])] = sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void st()
{
setfr(sys->cpu->gr[get_r_r1(w[0])] = sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void st()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
sys->memory[get_adr_x(w[1], w[0])] = sys->cpu->gr[get_r_r1(w[0])];
sys->cpu->pr += 2;
}
void lad()
{
sys->memory[get_adr_x(w[1], w[0])] = sys->cpu->gr[get_r_r1(w[0])];
sys->cpu->pr += 2;
}
void lad()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
sys->cpu->gr[get_r_r1(w[0])] = get_adr_x(w[1], w[0]);
sys->cpu->pr += 2;
}
sys->cpu->gr[get_r_r1(w[0])] = get_adr_x(w[1], w[0]);
sys->cpu->pr += 2;
}
@@
-306,34
+288,28
@@
void adda(WORD r, WORD val)
void adda_r_adr_x()
{
void adda_r_adr_x()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
adda(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void adda_r1_r2()
{
adda(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void adda_r1_r2()
{
- WORD w[1];
- w[0] = sys->memory[sys->cpu->pr];
+ WORD w[] = {sys->memory[sys->cpu->pr]};
adda(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void suba_r_adr_x()
{
adda(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void suba_r_adr_x()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
adda(get_r_r1(w[0]), ~(get_val_adr_x(w[1], w[0])) + 1);
sys->cpu->pr += 2;
}
void suba_r1_r2()
{
adda(get_r_r1(w[0]), ~(get_val_adr_x(w[1], w[0])) + 1);
sys->cpu->pr += 2;
}
void suba_r1_r2()
{
- WORD w[1];
- w[0] = sys->memory[sys->cpu->pr];
+ WORD w[] = {sys->memory[sys->cpu->pr]};
adda(get_r_r1(w[0]), ~(sys->cpu->gr[get_x_r2(w[0])]) + 1);
sys->cpu->pr += 1;
}
adda(get_r_r1(w[0]), ~(sys->cpu->gr[get_x_r2(w[0])]) + 1);
sys->cpu->pr += 1;
}
@@
-371,92
+347,77
@@
void addl_gr(WORD r, WORD val, bool add)
void addl_r_adr_x()
{
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[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), true);
sys->cpu->pr += 2;
}
void addl_r1_r2()
{
addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), true);
sys->cpu->pr += 2;
}
void addl_r1_r2()
{
- WORD w[1];
- w[0] = sys->memory[sys->cpu->pr];
+ WORD w[] = {sys->memory[sys->cpu->pr]};
addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], true);
sys->cpu->pr += 1;
}
void subl_r_adr_x()
{
addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], true);
sys->cpu->pr += 1;
}
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[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), false);
sys->cpu->pr += 2;
}
void subl_r1_r2()
{
addl_gr(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]), false);
sys->cpu->pr += 2;
}
void subl_r1_r2()
{
- WORD w[1];
- w[0] = sys->memory[sys->cpu->pr];
+ WORD w[] = {sys->memory[sys->cpu->pr]};
addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], false);
sys->cpu->pr += 1;
}
void and_r_adr_x()
{
addl_gr(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])], false);
sys->cpu->pr += 1;
}
void and_r_adr_x()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
setfr(sys->cpu->gr[get_r_r1(w[0])] &= get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void and_r1_r2()
{
setfr(sys->cpu->gr[get_r_r1(w[0])] &= get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void and_r1_r2()
{
- WORD w[1];
- w[0] = sys->memory[sys->cpu->pr];
+ WORD w[] = {sys->memory[sys->cpu->pr]};
setfr(sys->cpu->gr[get_r_r1(w[0])] &= sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void or_r_adr_x()
{
setfr(sys->cpu->gr[get_r_r1(w[0])] &= sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void or_r_adr_x()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
setfr(sys->cpu->gr[get_r_r1(w[0])] |= get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void or_r1_r2()
{
setfr(sys->cpu->gr[get_r_r1(w[0])] |= get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void or_r1_r2()
{
- WORD w[1];
- w[0] = sys->memory[sys->cpu->pr];
+ WORD w[] = {sys->memory[sys->cpu->pr]};
setfr(sys->cpu->gr[get_r_r1(w[0])] |= sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void xor_r_adr_x()
{
setfr(sys->cpu->gr[get_r_r1(w[0])] |= sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void xor_r_adr_x()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
setfr(sys->cpu->gr[get_r_r1(w[0])] ^= get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void xor_r1_r2()
{
setfr(sys->cpu->gr[get_r_r1(w[0])] ^= get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void xor_r1_r2()
{
- WORD w[1];
- w[0] = sys->memory[sys->cpu->pr];
+ WORD w[] = {sys->memory[sys->cpu->pr]};
setfr(sys->cpu->gr[get_r_r1(w[0])] ^= sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void cpa(WORD r, WORD val)
{
setfr(sys->cpu->gr[get_r_r1(w[0])] ^= sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void cpa(WORD r, WORD val)
{
- sys->cpu->fr = 0
x0
;
+ sys->cpu->fr = 0;
if((short)sys->cpu->gr[r] < (short)val) {
sys->cpu->fr = SF;
} else if(sys->cpu->gr[r] == val) {
if((short)sys->cpu->gr[r] < (short)val) {
sys->cpu->fr = SF;
} else if(sys->cpu->gr[r] == val) {
@@
-466,17
+427,14
@@
void cpa(WORD r, WORD val)
void cpa_r_adr_x()
{
void cpa_r_adr_x()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
cpa(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void cpa_r1_r2()
{
cpa(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void cpa_r1_r2()
{
- WORD w[1];
- w[0] = sys->memory[sys->cpu->pr];
+ WORD w[] = {sys->memory[sys->cpu->pr]};
cpa(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
cpa(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
@@
-493,32
+451,28
@@
void cpl(WORD r, WORD val)
void cpl_r_adr_x()
{
void cpl_r_adr_x()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
cpl(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void cpl_r1_r2()
{
cpl(get_r_r1(w[0]), get_val_adr_x(w[1], w[0]));
sys->cpu->pr += 2;
}
void cpl_r1_r2()
{
- WORD w[1];
- w[0] = sys->memory[sys->cpu->pr];
+ WORD w[] = {sys->memory[sys->cpu->pr]};
cpl(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void sla()
{
cpl(get_r_r1(w[0]), sys->cpu->gr[get_x_r2(w[0])]);
sys->cpu->pr += 1;
}
void sla()
{
- WORD w[2], sign, last = 0x0, r;
- int i;
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
+ WORD r = get_r_r1(w[0]);
+ WORD sign = sys->cpu->gr[r] & 0x8000;
+ WORD last = 0;
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
- sys->cpu->fr = 0x0;
- sign = sys->cpu->gr[(r = get_r_r1(w[0]))] & 0x8000;
+ sys->cpu->fr = 0;
sys->cpu->gr[r] &= 0x7FFF;
sys->cpu->gr[r] &= 0x7FFF;
- for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
+ for(i
nt i
= 0; i < get_adr_x(w[1], w[0]); i++) {
last = sys->cpu->gr[r] & 0x4000;
sys->cpu->gr[r] <<= 1;
}
last = sys->cpu->gr[r] & 0x4000;
sys->cpu->gr[r] <<= 1;
}
@@
-540,15
+494,14
@@
void sla()
void sra()
{
void sra()
{
- WORD w[2], sign, last = 0x0, r;
- int i;
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
+ WORD r = get_r_r1(w[0]);
+ WORD sign = sys->cpu->gr[r] & 0x8000;
+ WORD last = 0;
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
- sys->cpu->fr = 0x0;
- sign = sys->cpu->gr[(r = get_r_r1(w[0]))] & 0x8000;
+ sys->cpu->fr = 0;
sys->cpu->gr[r] &= 0x7FFF;
sys->cpu->gr[r] &= 0x7FFF;
- for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
+ for(i
nt i
= 0; i < get_adr_x(w[1], w[0]); i++) {
last = sys->cpu->gr[r] & 0x1;
sys->cpu->gr[r] >>= 1;
if(sign > 0) {
last = sys->cpu->gr[r] & 0x1;
sys->cpu->gr[r] >>= 1;
if(sign > 0) {
@@
-573,14
+526,13
@@
void sra()
void sll()
{
void sll()
{
- WORD w[2], last = 0x0, r;
- int i;
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
+ WORD last = 0;
+ WORD r = get_r_r1(w[0]);
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
sys->cpu->fr = 0x0;
sys->cpu->fr = 0x0;
- for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
- last = sys->cpu->gr[
(r = get_r_r1(w[0]))
] & 0x8000;
+ for(i
nt i
= 0; i < get_adr_x(w[1], w[0]); i++) {
+ last = sys->cpu->gr[
r
] & 0x8000;
sys->cpu->gr[r] <<= 1;
}
/* OFに、レジスタから最後に送り出されたビットの値を設定 */
sys->cpu->gr[r] <<= 1;
}
/* OFに、レジスタから最後に送り出されたビットの値を設定 */
@@
-600,14
+552,12
@@
void sll()
void srl()
{
void srl()
{
- WORD w[2], last = 0x0, r;
- int i;
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
+ WORD last = 0;
+ WORD r = get_r_r1(w[0]);
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
sys->cpu->fr = 0x0;
sys->cpu->fr = 0x0;
- r = get_r_r1(w[0]);
- for(i = 0; i < get_adr_x(w[1], w[0]); i++) {
+ for(int i = 0; i < get_adr_x(w[1], w[0]); i++) {
last = sys->cpu->gr[r] & 0x0001;
sys->cpu->gr[r] >>= 1;
}
last = sys->cpu->gr[r] & 0x0001;
sys->cpu->gr[r] >>= 1;
}
@@
-628,9
+578,7
@@
void srl()
void jpl()
{
void jpl()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
if((sys->cpu->fr & (SF | ZF)) == 0) {
sys->cpu->pr = get_adr_x(w[1], w[0]);
} else {
if((sys->cpu->fr & (SF | ZF)) == 0) {
sys->cpu->pr = get_adr_x(w[1], w[0]);
} else {
@@
-640,9
+588,7
@@
void jpl()
void jmi()
{
void jmi()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
if((sys->cpu->fr & SF) > 0) {
sys->cpu->pr = get_adr_x(w[1], w[0]);
} else {
if((sys->cpu->fr & SF) > 0) {
sys->cpu->pr = get_adr_x(w[1], w[0]);
} else {
@@
-652,9
+598,7
@@
void jmi()
void jnz()
{
void jnz()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
if((sys->cpu->fr & ZF) == 0) {
sys->cpu->pr = get_adr_x(w[1], w[0]);
} else {
if((sys->cpu->fr & ZF) == 0) {
sys->cpu->pr = get_adr_x(w[1], w[0]);
} else {
@@
-664,9
+608,7
@@
void jnz()
void jze()
{
void jze()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
if((sys->cpu->fr & ZF) > 0) {
sys->cpu->pr = get_adr_x(w[1], w[0]);
} else {
if((sys->cpu->fr & ZF) > 0) {
sys->cpu->pr = get_adr_x(w[1], w[0]);
} else {
@@
-676,9
+618,7
@@
void jze()
void jov()
{
void jov()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
if((sys->cpu->fr & OF) > 0) {
sys->cpu->pr = get_adr_x(w[1], w[0]);
} else {
if((sys->cpu->fr & OF) > 0) {
sys->cpu->pr = get_adr_x(w[1], w[0]);
} else {
@@
-688,19
+628,14
@@
void jov()
void jump()
{
void jump()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
sys->cpu->pr = get_adr_x(w[1], w[0]);
}
void push()
{
assert(sys->cpu->sp > execptr->end && sys->cpu->sp <= sys->memsize);
sys->cpu->pr = get_adr_x(w[1], w[0]);
}
void push()
{
assert(sys->cpu->sp > execptr->end && sys->cpu->sp <= sys->memsize);
- WORD w[2];
-
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
sys->memory[--(sys->cpu->sp)] = get_adr_x(w[1], w[0]);
sys->cpu->pr += 2;
}
sys->memory[--(sys->cpu->sp)] = get_adr_x(w[1], w[0]);
sys->cpu->pr += 2;
}
@@
-708,15
+643,14
@@
void push()
void pop()
{
assert(sys->cpu->sp > execptr->end);
void pop()
{
assert(sys->cpu->sp > execptr->end);
- WORD w;
- char *s;
+ WORD w
[] = {sys->memory[sys->cpu->pr]}
;
+ char *s
= NULL
;
if(sys->cpu->sp >= sys->memsize) {
setcerr(203, s = pr2str(sys->cpu->pr)); /* Stack Pointer (SP) - stack underflow */
FREE(s);
} else {
if(sys->cpu->sp >= sys->memsize) {
setcerr(203, s = pr2str(sys->cpu->pr)); /* Stack Pointer (SP) - stack underflow */
FREE(s);
} else {
- w = sys->memory[sys->cpu->pr];
- sys->cpu->gr[get_r_r1(w)] = sys->memory[(sys->cpu->sp)++];
+ sys->cpu->gr[get_r_r1(w[0])] = sys->memory[(sys->cpu->sp)++];
sys->cpu->pr += 1;
}
}
sys->cpu->pr += 1;
}
}
@@
-724,9
+658,7
@@
void pop()
void call()
{
assert(sys->cpu->sp > execptr->end && sys->cpu->sp <= sys->memsize);
void call()
{
assert(sys->cpu->sp > execptr->end && sys->cpu->sp <= sys->memsize);
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
sys->memory[--(sys->cpu->sp)] = sys->cpu->pr + 1;
sys->cpu->pr = get_adr_x(w[1], w[0]);
}
sys->memory[--(sys->cpu->sp)] = sys->cpu->pr + 1;
sys->cpu->pr = get_adr_x(w[1], w[0]);
}
@@
-743,9
+675,7
@@
void ret()
void svc()
{
void svc()
{
- WORD w[2];
- w[0] = sys->memory[sys->cpu->pr];
- w[1] = sys->memory[sys->cpu->pr + 1];
+ WORD w[] = {sys->memory[sys->cpu->pr], sys->memory[sys->cpu->pr + 1]};
switch(get_adr_x(w[1], w[0]))
{
case 0x0: /* STOP */
switch(get_adr_x(w[1], w[0]))
{
case 0x0: /* STOP */
@@
-763,9
+693,10
@@
void svc()
void exec()
{
void exec()
{
- clock_t clock_begin, clock_end;
- void (*cmdptr)();
- char *s;
+ clock_t clock_begin = 0;
+ clock_t clock_end = 0;
+ void (*cmdptr)() = NULL;
+ char *s = NULL;
const char *monmsg = "COMET II machine code monitor. Type ? for help.\n";
create_cmdtable(HASH_CODE); /* 命令のコードとタイプがキーのハッシュ表を作成 */
const char *monmsg = "COMET II machine code monitor. Type ? for help.\n";
create_cmdtable(HASH_CODE); /* 命令のコードとタイプがキーのハッシュ表を作成 */
@@
-800,20
+731,17
@@
void exec()
/* プログラムレジスタをチェック */
if(sys->cpu->pr >= sys->memsize) {
setcerr(201, s = pr2str(sys->cpu->pr)); /* Program Register (PR) - memory overflow */
/* プログラムレジスタをチェック */
if(sys->cpu->pr >= sys->memsize) {
setcerr(201, s = pr2str(sys->cpu->pr)); /* Program Register (PR) - memory overflow */
- FREE(s);
goto execfin;
}
/* スタックポインタをチェック */
if(sys->cpu->sp <= execptr->end) {
setcerr(202, s = pr2str(sys->cpu->pr)); /* Stack Pointer (SP) - stack overflow */
goto execfin;
}
/* スタックポインタをチェック */
if(sys->cpu->sp <= execptr->end) {
setcerr(202, s = pr2str(sys->cpu->pr)); /* Stack Pointer (SP) - stack overflow */
- FREE(s);
goto execfin;
}
/* コードから命令を取得 */
/* 取得できない場合はエラー終了 */
if((cmdptr = getcmdptr(sys->memory[sys->cpu->pr] & 0xFF00)) == NULL) {
setcerr(204, s = pr2str(sys->cpu->pr)); /* OP in word #1 - not command code */
goto execfin;
}
/* コードから命令を取得 */
/* 取得できない場合はエラー終了 */
if((cmdptr = getcmdptr(sys->memory[sys->cpu->pr] & 0xFF00)) == NULL) {
setcerr(204, s = pr2str(sys->cpu->pr)); /* OP in word #1 - not command code */
- FREE(s);
goto execfin;
}
/* 命令の実行 */
goto execfin;
}
/* 命令の実行 */
@@
-837,6
+765,7
@@
void exec()
} while(clock_end - clock_begin < CLOCKS_PER_SEC / sys->clocks);
}
execfin:
} while(clock_end - clock_begin < CLOCKS_PER_SEC / sys->clocks);
}
execfin:
+ FREE(s);
freebps();
free_cmdtable(HASH_CODE); /* 命令のコードとタイプがキーのハッシュ表を解放 */
if(cerr->num > 0) {
freebps();
free_cmdtable(HASH_CODE); /* 命令のコードとタイプがキーのハッシュ表を解放 */
if(cerr->num > 0) {