[svn:parrot] r30379 - in trunk: config/gen/makefiles src

[julianalbo]

Author: julianalbo
Date: Wed Aug 20 07:24:49 2008
New Revision: 30379

Modified:
   trunk/config/gen/makefiles/root.in
   trunk/src/parrot_debugger.c
   trunk/src/runops_cores.c

Log:
link parrot_debugger to parrot_config and some debugger fixes

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in  (original)
+++ trunk/config/gen/makefiles/root.in  Wed Aug 20 07:24:49 2008
@@ -900,6 +900,7 @@
 $(PDB) : $(SRC_DIR)/parrot_debugger$(O) $(LIBPARROT)
        $(LINK) @[EMAIL PROTECTED]@ \
     $(SRC_DIR)/parrot_debugger$(O) \
+    $(SRC_DIR)/parrot_config$(O) \
     @rpath_blib@ $(ALL_PARROT_LIBS) $(LINKFLAGS)
 #CONDITIONED_LINE(win32):      if exist [EMAIL PROTECTED] mt.exe -manifest 
[EMAIL PROTECTED] -outputresource:$@;1
 

Modified: trunk/src/parrot_debugger.c
==============================================================================
--- trunk/src/parrot_debugger.c (original)
+++ trunk/src/parrot_debugger.c Wed Aug 20 07:24:49 2008
@@ -132,7 +132,7 @@
 main(int argc, char *argv[])
 {
     int nextarg;
-    Parrot_Interp     interp   = Parrot_new(NULL);
+    Parrot_Interp     interp;
 
     /*
     Parrot_Interp     debugger = Parrot_new(interp);
@@ -144,6 +144,12 @@
     char             *ext;
     void             *yyscanner;
 
+    Parrot_set_config_hash();
+
+    interp = Parrot_new(NULL);
+
+    Parrot_set_executable_name(interp, string_from_cstring(interp, argv[0], 
0));
+
     Parrot_debugger_init(interp);
 
     pdb = interp->pdb;
@@ -181,6 +187,7 @@
             return 1;
 
         Parrot_loadbc(interp, pf);
+        PackFile_fixup_subs(interp, PBC_MAIN, NULL);
     }
     else {
         Parrot_PackFile pf        = PackFile_new(interp, 0);
@@ -247,7 +254,7 @@
         return;
     }
 
-    Parrot_runcode(interp, argc - 1, argv + 1);
+    Parrot_runcode(interp, argc, argv);
     free_runloop_jump_point(interp);
 }
 

Modified: trunk/src/runops_cores.c
==============================================================================
--- trunk/src/runops_cores.c    (original)
+++ trunk/src/runops_cores.c    Wed Aug 20 07:24:49 2008
@@ -324,7 +324,7 @@
 opcode_t *
 runops_debugger_core(PARROT_INTERP, ARGIN(opcode_t *pc))
 {
-    fprintf(stderr, "Enter runops_debugger_core\n");
+    /*fprintf(stderr, "Enter runops_debugger_core\n");*/
 
     PARROT_ASSERT(interp->pdb);