COMMON: moved decompiler to command line

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2018-02-03 (0.12.12)
+	COMMON: restore 6d array handling
+	COMMON: increase default stack size
+
 2018-01-13 (0.12.12)
 	Fix osx crash
 

src/common/Makefile.am

@@ -53,7 +53,6 @@ libsb_common_a_SOURCES =                  \
     blib_sound.c                          \
     brun.c                                \
     ceval.c                               \
-    decomp.c                              \
     device.c device.h                     \
     screen.c                              \
     system.c                              \

src/common/brun.c

@@ -31,7 +31,6 @@ int exec_close_task();
 void sys_before_comp();
 
 static char fileName[OS_FILENAME_SIZE + 1];
-static int exec_tid;
 static stknode_t err_node;
 
 #define EVT_CHECK_EVERY 50
@@ -1528,47 +1527,7 @@ int sbasic_recursive_exec(int tid) {
 }
 
 /**
- * dump-taskinfo
- */
-void sbasic_dump_taskinfo(FILE * output) {
-  int i;
-  int prev_tid = 0;
-
-  fprintf(output, "\n* task list:\n");
-  for (i = 0; i < count_tasks(); i++) {
-    prev_tid = activate_task(i);
-    fprintf(output, "  id %d, child of %d, file %s, status %d\n", ctask->tid, ctask->parent, ctask->file,
-        ctask->status);
-  }
-  activate_task(prev_tid);
-}
-
-/**
- * dump-bytecode
- */
-void sbasic_dump_bytecode(int tid, FILE *output) {
-  int i;
-  int prev_tid;
-
-  prev_tid = activate_task(tid);
-
-  for (i = 0; i < count_tasks(); i++) {
-    activate_task(i);
-    if (ctask->parent == tid) {
-      // do the same for the childs
-      sbasic_dump_bytecode(ctask->tid, output);
-    }
-  }
-
-  activate_task(tid);
-  fprintf(output, "\n* task: %d/%d (%s)\n", ctask->tid, count_tasks(), prog_file);
-  // run the code
-  dump_bytecode(output);
-  activate_task(prev_tid);
-}
-
-/**
- * TODO add comment
+ * compile the given file into bytecode
  */
 int sbasic_compile(const char *file) {
   int comp_rq = 0;              // compilation required = 0
@@ -1626,18 +1585,21 @@ int sbasic_compile(const char *file) {
 /**
  * initialize executor and run a binary
  */
-void sbasic_exec_prepare(const char *filename) {
+int sbasic_exec_prepare(const char *filename) {
+  int taskId;
+
   v_init_pool();
 
   // load source
   if (opt_nosave) {
-    exec_tid = brun_create_task(filename, ctask->bytecode, 0);
+    taskId = brun_create_task(filename, ctask->bytecode, 0);
   } else {
-    exec_tid = brun_create_task(filename, 0, 0);
+    taskId = brun_create_task(filename, 0, 0);
   }
   // reset system
   cmd_play_reset();
   graph_reset();
+  return taskId;
 }
 
 /*
@@ -1694,9 +1656,6 @@ int sbasic_exec(const char *file) {
   opt_pref_height = 0;
   opt_show_page = 0;
 
-  if (opt_decomp) {
-    opt_nosave = 1;
-  }
   // setup global values
   gsb_last_line = gsb_last_error = 0;
   strlcpy(gsb_last_file, file, sizeof(gsb_last_file));
@@ -1708,20 +1667,14 @@ int sbasic_exec(const char *file) {
     // cannot run a unit
     exec_rq = 0;
     gsb_last_error = 1;
-  } else if (opt_decomp && success) {
-    sbasic_exec_prepare(file);  // load everything
-    sbasic_dump_taskinfo(stdout);
-    sbasic_dump_bytecode(exec_tid, stdout);
-    exec_close(exec_tid);       // clean up executor's garbages
-    exec_rq = 0;
   } else if (!success) {        // there was some errors; do not continue
     exec_rq = 0;
     gsb_last_error = 1;
   }
 
   if (exec_rq) {                // we will run it
     // load everything
-    sbasic_exec_prepare(file);
+    int exec_tid = sbasic_exec_prepare(file);
 
     dev_init(opt_graphics, 0);  // initialize output device for graphics
     srand(clock());             // randomize

src/common/smbas.h

@@ -101,7 +101,6 @@ typedef struct {
 
 EXTERN byte opt_graphics; /**< command-line option: start in graphics mode   */
 EXTERN byte opt_quiet; /**< command-line option: quiet                       */
-EXTERN byte opt_decomp; /**< decompile                                       */
 EXTERN char opt_command[OPT_CMD_SZ]; /**< command-line parameters (COMMAND$) */
 EXTERN int opt_base; /**< OPTION BASE x                                      */
 EXTERN byte opt_loadmod; /**< load all modules                               */
@@ -242,14 +241,6 @@ void brun_stop(void);
  */
 int brun_status(void);
 
-/**
- * decompiler,
- * dumps the code in the current task
- *
- * @param output the output stream (FILE*)
- */
-void dump_bytecode(FILE *output);
-
 /**
  * returns the last-modified time of the file
  *

src/platform/android/jni/common/Android.mk

@@ -29,7 +29,6 @@ LOCAL_SRC_FILES  :=    \
     $(COMMON)/blib_sound.c       \
     $(COMMON)/brun.c             \
     $(COMMON)/ceval.c            \
-    $(COMMON)/decomp.c           \
     $(COMMON)/device.c           \
     $(COMMON)/screen.c           \
     $(COMMON)/system.c           \

src/platform/console/Makefile.am

@@ -9,8 +9,9 @@ AM_CPPFLAGS = -I$(top_builddir)/src -I. @PACKAGE_CFLAGS@
 
 bin_PROGRAMS = sbasic
 
-sbasic_SOURCES =          \
+sbasic_SOURCES =    \
   ../console/main.c	\
+  ../console/decomp.c	\
   ../console/dev_null.c
 
 sbasic_LDADD = -L$(top_srcdir)/src/common -lsb_common @PACKAGE_LIBS@

src/common/decomp.c renamed to src/platform/console/decomp.c

@@ -10,11 +10,9 @@
 #include "common/sbapp.h"
 
 /**
- *
  * decompiler
- *
  */
-void dump_bytecode(FILE * output) {
+void dump_bytecode(FILE *output) {
   int i, c, b, d, h, l, j;
   long lng;
   int len, new_ip;

src/platform/console/main.c

@@ -13,6 +13,13 @@
 // global filename (its needed for CTRL+C signal - delete temporary)
 char g_file[OS_PATHNAME_SIZE + 1];
 
+// decompile handling
+int decomp;
+void dump_bytecode(FILE *output);
+int sbasic_compile(const char *file);
+int sbasic_exec_prepare(const char *file);
+int exec_close(int tid);
+
 /*
  * remove temporary files
  *
@@ -131,6 +138,7 @@ int setup_file(const char *program) {
 int process_options(int argc, char *argv[]) {
   int opt_ihavename = 0;
   int opt_nomore = 0;
+  decomp = 0;
 
   for (int i = 1; i < argc; i++) {
     if (argv[i][0] == '-') {
@@ -152,7 +160,8 @@ int process_options(int argc, char *argv[]) {
 
         case 's':
           // decompile
-          opt_decomp++;
+          decomp = 1;
+          opt_nosave = 1;
           break;
 
         case 'c':
@@ -261,6 +270,52 @@ void *malloc(size_t size) {
 }
 #endif
 
+void print_taskinfo(FILE *output) {
+  int prev_tid = 0;
+
+  fprintf(output, "\n* task list:\n");
+  for (int i = 0; i < count_tasks(); i++) {
+    prev_tid = activate_task(i);
+    fprintf(output, "  id %d, child of %d, file %s, status %d\n",
+            ctask->tid, ctask->parent, ctask->file, ctask->status);
+  }
+  activate_task(prev_tid);
+}
+
+void print_bytecode(int tid, FILE *output) {
+  int prev_tid = activate_task(tid);
+  fprintf(stderr, "%d %d %d\n", prev_tid, tid, count_tasks());
+
+  for (int i = 0; i < count_tasks(); i++) {
+    activate_task(i);
+    if (ctask->parent == tid) {
+      // do the same for the childs
+      print_bytecode(ctask->tid, output);
+      exit(1);
+    }
+  }
+
+  activate_task(tid);
+  fprintf(output, "\n* task: %d/%d (%s)\n", ctask->tid, count_tasks(), prog_file);
+  dump_bytecode(output);
+  activate_task(prev_tid);
+}
+
+void decompile() {
+  init_tasks();
+  unit_mgr_init();
+  sblmgr_init(0, NULL);
+  if (sbasic_compile(g_file)) {
+    int exec_tid = sbasic_exec_prepare(g_file);
+    print_taskinfo(stdout);
+    print_bytecode(exec_tid, stdout);
+    exec_close(exec_tid);
+  }
+  unit_mgr_close();
+  sblmgr_close();
+  destroy_tasks();
+}
+
 /*
  * program entry point
  */
@@ -282,7 +337,11 @@ int main(int argc, char *argv[]) {
       char prev_cwd[OS_PATHNAME_SIZE + 1];
       prev_cwd[0] = 0;
       getcwd(prev_cwd, sizeof(prev_cwd) - 1);
-      sbasic_main(g_file);
+      if (decomp) {
+        decompile();
+      } else {
+        sbasic_main(g_file);
+      }
       chdir(prev_cwd);
     } else {
       show_brief_help();