testing runEmu: read cmd from file

diff --git a/testing/compat.c b/testing/compat.c
index 320d647f9f231bb192e7b1caf9afd9b468441f59..8a0ec396bf63b2b10ebe3f420bfa3ee927b23a4d 100644 (file)
--- a/testing/compat.c
+++ b/testing/compat.c
@@ -109,8 +109,8 @@ int ReadRaw(const char *name, unsigned char *buff, int maxlen)
         }
       }
     fclose(f);
-    printf("using raw from %s:\n",name);
-    HexDump(buff,len);
+//    printf("using raw from %s:\n",name);
+//    HexDump(buff,len);
     return len;
     }
   printf("failed to open raw file %s: %s\n",name,strerror(errno));

diff --git a/testing/testN2RunEmu.c b/testing/testN2RunEmu.c
index d745fa67c25dc8494c3aa36d74eda13c54e6e11f..eec8d698b5577f3aa57b9256c6f3c529da345dde 100644 (file)
--- a/testing/testN2RunEmu.c
+++ b/testing/testN2RunEmu.c
@@ -12,7 +12,7 @@
 int main(int argc, char *argv[])
 {
   if(argc<4) {
-    printf("usage: %s <plugin-dir> <id> <cmd> [LOG]\n",argv[0]);
+    printf("usage: %s <plugin-dir> <id> <cmdfile> [LOG]\n",argv[0]);
     return 1;
     }
 
@@ -21,27 +21,7 @@ int main(int argc, char *argv[])
   if(argc<=4 || strcasecmp(argv[4],"LOG"))
     cLogging::SetModuleOption(LCLASS(L_SYS,L_SYS_DISASM),false);
   unsigned char data[1024];
-  unsigned int len = 0;
-  char *p = argv[3];
-  char last = -1;
-  while(p < argv[3]+strlen(argv[3]) && len < sizeof(data)) {
-    if(*p == ' ' || *p == '\t') {
-      if(last>=0) { printf("failed to read data\n"); return 1; }
-      p++;
-      continue;
-      }
-    unsigned char b;
-    if(*p >= '0' && *p <= '9')      b = *p - '0';
-    else if(*p >= 'a' && *p <= 'f') b = *p - 'a' + 10;
-    else if(*p >= 'A' && *p <= 'F') b = *p - 'A' + 10;
-    else { printf("failed to read data\n"); return 1; }
-    if(last<0) last = b;
-    else {
-      data[len++] = (last << 4) | b;
-      last = -1;
-      }
-    p++;
-    }
+  unsigned int len=ReadRaw(argv[3],data,sizeof(data));
   int id=strtol(argv[2],0,0);
   cN2Prov *emmP=cN2Providers::GetProv(id,N2FLAG_NONE);
   HEXDUMP(L_SYS_EMU,data,len,"Input");