projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefileの修正
[YACASL2.git]
/
src
/
casl2.c
diff --git
a/src/casl2.c
b/src/casl2.c
index
7ec14fa
..
40001ea
100644
(file)
--- a/
src/casl2.c
+++ b/
src/casl2.c
@@
-40,7
+40,7
@@
void outassemble(const char *file) {
perror(file);
exit(-1);
}
perror(file);
exit(-1);
}
- fwrite(
memory, sizeof(WORD), progprop
->end, fp);
+ fwrite(
sys->memory, sizeof(WORD), prog
->end, fp);
fclose(fp);
}
fclose(fp);
}
@@
-54,16
+54,16
@@
const char *objfile_name(const char *str)
/* casl2コマンドのメイン */
int main(int argc, char *argv[])
{
/* casl2コマンドのメイン */
int main(int argc, char *argv[])
{
- int opt, i, status = 0;
+ int memsize = DEFAULT_MEMSIZE, clocks = DEFAULT_CLOCKS;
+ int status = 0, opt, i;
PASS pass;
bool res = false;
WORD beginptr[argc];
char *objfile = NULL;
const char *usage =
PASS pass;
bool res = false;
WORD beginptr[argc];
char *objfile = NULL;
const char *usage =
- "Usage: %s [-slLaAtTdh] [-oO
<OBJECTFILE>] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE ...
\n";
+ "Usage: %s [-slLaAtTdh] [-oO
[<OBJECTFILE>]] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE1[ FILE2 ...]
\n";
- /* エラーの初期化 */
- cerr = malloc_chk(sizeof(CERR), "cerr");
+ cerr_init();
addcerrlist_casl2();
/* オプションの処理 */
while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) {
addcerrlist_casl2();
/* オプションの処理 */
while((opt = getopt_long(argc, argv, "tTdslLao::O::AM:C:h", longopts, NULL)) != -1) {
@@
-123,7
+123,7
@@
int main(int argc, char *argv[])
exit(-1);
}
/* COMET II仮想マシンのリセット */
exit(-1);
}
/* COMET II仮想マシンのリセット */
- reset();
+ reset(
memsize, clocks
);
/* アセンブル。ラベル表作成のため、2回行う */
for(pass = FIRST; pass <= SECOND; pass++) {
if(pass == FIRST) {
/* アセンブル。ラベル表作成のため、2回行う */
for(pass = FIRST; pass <= SECOND; pass++) {
if(pass == FIRST) {
@@
-137,6
+137,7
@@
int main(int argc, char *argv[])
} else if(pass == SECOND) {
asprop->ptr = beginptr[i];
}
} else if(pass == SECOND) {
asprop->ptr = beginptr[i];
}
+ asprop->prog = NULL;
if(execmode.trace == true || execmode.dump == true || asmode.src == true ||
asmode.label == true || asmode.asdetail == true)
{
if(execmode.trace == true || execmode.dump == true || asmode.src == true ||
asmode.label == true || asmode.asdetail == true)
{