ファイル構成の修正

[heavyosecpu/HeavyOSECPU.git] / main.c

diff --git a/main.c b/main.c
index dbf7bc1..2d5d7c8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -39,22 +39,22 @@ int osecpuMain(int argc, char **argv)
        FILE *fp = fopen(SYSLIB_OSE, "rb");
        if (fp == NULL) {
                syslib[0] = '/';
-               strcpy(syslib + 1, argv[0]);
+               strcpy((char *)syslib + 1, argv[0]);
                up = syslib + 1;
-               while (*up != '¥0') up++;
+               while (*up != '\0') up++;
                while (*up != '/' && *up != 0x5c) up--;
                up++;
-               strcpy(up, SYSLIB_OSE);
-               fp = fopen(syslib + 1, "rb");
+               strcpy((char *)up, SYSLIB_OSE);
+               fp = fopen((char *)syslib + 1, "rb");
        }
        if (fp == NULL) {
-               fputs("syslib-file fopen error.¥n", stderr);
+               fputs("syslib-file fopen error.\n", stderr);
                return 1;
        }
        appsiz0 = fread(syslib, 1, SYSLIBSIZ1 - 4, fp);
        fclose(fp);
        if (appsiz0 >= SYSLIBSIZ1 - 4) {
-               fputs("syslib-file too large.¥n", stderr);
+               fputs("syslib-file too large.\n", stderr);
                return 1;
        }
        if (syslib[0] == 0x05 && syslib[1] == 0xc1) {
@@ -68,14 +68,14 @@ int osecpuMain(int argc, char **argv)
        sysjit0 = sysjit1;
        i = jitc0(&sysjit1, sysjit00 + SJITSIZ1, syslib + 32, syslib + SYSLIBSIZ1, JITC_LV_SLOWEST + 9, label);
        if (i != 0) {
-               fputs("syslib-file JITC error.¥n", stderr);
+               fputs("syslib-file JITC error.\n", stderr);
                return 1;
        }
        di1_serial++;
 
        /* アプリバイナリの読み込み */
        if (argc <= 1) { return 0; }
-       const unsigned char *argv1 = argv[1];
+       const char *argv1 = argv[1];
        if (argv1[0] == ':' && argv1[2] == ':') {
                level = argv1[1] - '0';
                if (level < 0 || level > 9)
@@ -84,18 +84,18 @@ int osecpuMain(int argc, char **argv)
        }
        fp = fopen(argv1, "rb");
        if (fp == NULL) {
-               fputs("app-file load error.¥n", stderr);
+               fputs("app-file load error.\n", stderr);
                return 1;
        }
        appsiz1 = appsiz0 = fread(appbin, 1, APPSIZ1 - 4, fp);
        fclose(fp);
        if (appsiz0 >= APPSIZ1 - 4) {
-               fputs("app-file too large.¥n", stderr);
+               fputs("app-file too large.\n", stderr);
                return 1;
        }
        if (appsiz0 < 3) {
        header_error:
-               fputs("app-file header error.¥n", stderr);
+               fputs("app-file header error.\n", stderr);
                return 1;
        }
 
@@ -108,15 +108,15 @@ int osecpuMain(int argc, char **argv)
                appsiz1 = -9;
 #endif
                if (appsiz1 < 0) {
-                       fputs("unsupported-format(tek5)¥n", stderr);
+                       fputs("unsupported-format(tek5)\n", stderr);
                        return 1;
                }
        }
 
        int argDebug = 0, stacksiz = 1;
-       const unsigned char *cp = searchArg(argc, argv, "debug:", 0);
+       const  char *cp = searchArg(argc, (const char **)argv, "debug:", 0);
        if (cp != NULL) argDebug = *cp - '0';
-       cp = searchArg(argc, argv, "stack:", 0);
+       cp = searchArg(argc, (const char **)argv, "stack:", 0);
        if (cp != NULL) stacksiz = strtol(cp, NULL, 0);
 
        struct Regs regs;
@@ -142,7 +142,7 @@ int osecpuMain(int argc, char **argv)
                (*jitfunc)(((char *)&regs) + 128); /* サイズを節約するためにEBPを128バイトずらす */
                if (regs.ireg[0] != 0) {
                        jp = regs.preg[2].p - 1;
-                       fprintf(stderr, "unpack error: %02X (at %06X) (R00=%d)¥n", *jp, jp - systmp0, regs.ireg[0]);
+                       fprintf(stderr, "unpack error: %02X (at %06X) (R00=%d)\n", *jp, jp - systmp0, regs.ireg[0]);
                        if ((argDebug & 2) != 0) {
                                fp = fopen("debug2.bin", "wb");
                                fwrite(systmp0, 1, jp - systmp0 + 16, fp);
@@ -186,7 +186,7 @@ int osecpuMain(int argc, char **argv)
        }
 
        regs.argc = argc;
-       regs.argv = argv;
+       regs.argv = (const char **)argv;
        regs.buf0 = regs.buf1 = NULL;
        regs.preg[0x28].p = p28;
        regs.preg[0x28].typ = 0; // TYP_CODE
@@ -198,7 +198,7 @@ int osecpuMain(int argc, char **argv)
        regs.winClosed = 0;
        regs.autoSleep = 0;
        regs.setjmpEnv = &setjmpEnv;
-       regs.lastConsoleChar = '¥n';
+       regs.lastConsoleChar = '\n';
 
        regs.label = label;
        regs.maxLabels = JITC_MAXLABELS;
@@ -206,7 +206,7 @@ int osecpuMain(int argc, char **argv)
        regs.jitbuf1 = jitbuf + 1024 * 1024;
        regs.errHndl = &errorHandler;
        regs.dbgr = 0;
-       if (searchArg(argc, argv, "dbgr:1", 0) != NULL) regs.dbgr = 1;
+       if (searchArg(argc, (const char **)argv, "dbgr:1", 0) != NULL) regs.dbgr = 1;
 
        if ((argDebug & 1) != 0) {
                fp = fopen("debug1.bin", "wb");
@@ -224,17 +224,17 @@ int osecpuMain(int argc, char **argv)
                while (regs.winClosed == 0)
                        drv_sleep(100);
        }
-       if (regs.lastConsoleChar != '¥n')
-               putchar('¥n');
+       if (regs.lastConsoleChar != '\n')
+               putchar('\n');
 
        tm2 = clock() / (double)CLOCKS_PER_SEC;
 
        /* 実行結果確認のためのレジスタダンプ */
-       if (searchArg(argc, argv, "verbose:1", 0) != NULL) {
-               printf("time: JITC=%.3f[sec], exec=%.3f[sec]¥n", tm1 - tm0, tm2 - tm1);
-               printf("size: OSECPU=%d, decomp=%d, tmp=%d, native=%d¥n", appsiz0, appsiz1, tmpsiz, appsiz2);
-               printf("result:¥n");
-               printf("R00:0x%08X  R01:0x%08X  R02:0x%08X  R03:0x%08X¥n", regs.ireg[0], regs.ireg[1], regs.ireg[2], regs.ireg[3]);
+       if (searchArg(argc, (const char **)argv, "verbose:1", 0) != NULL) {
+               printf("time: JITC=%.3f[sec], exec=%.3f[sec]\n", tm1 - tm0, tm2 - tm1);
+               printf("size: OSECPU=%d, decomp=%d, tmp=%d, native=%d\n", appsiz0, appsiz1, tmpsiz, appsiz2);
+               printf("result:\n");
+               printf("R00:0x%08X  R01:0x%08X  R02:0x%08X  R03:0x%08X\n", regs.ireg[0], regs.ireg[1], regs.ireg[2], regs.ireg[3]);
        }
 #if (USE_DEBUGGER != 0)
        dbgrMain(&regs);