cvsuser 03/11/12 23:33:11
Modified: src interpreter.c packfile.c
Log:
Couple of minor comments and trace conditionals.
Revision Changes Path
1.228 +4 -1 parrot/src/interpreter.c
Index: interpreter.c
===================================================================
RCS file: /cvs/public/parrot/src/interpreter.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -w -r1.227 -r1.228
--- interpreter.c 12 Nov 2003 11:02:33 -0000 1.227
+++ interpreter.c 13 Nov 2003 07:33:11 -0000 1.228
@@ -1,7 +1,7 @@
/* interpreter.c
* Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
* CVS Info
- * $Id: interpreter.c,v 1.227 2003/11/12 11:02:33 leo Exp $
+ * $Id: interpreter.c,v 1.228 2003/11/13 07:33:11 mrjoltcola Exp $
* Overview:
* The interpreter api handles running the operations
* Data Structure and Algorithms:
@@ -1140,6 +1140,9 @@
}
+/*
+ * setup default compiler for PASM
+ */
static void setup_default_compreg(Parrot_Interp interpreter)
{
STRING *pasm1 = string_from_cstring(interpreter, "PASM1", 0);
1.116 +16 -2 parrot/src/packfile.c
Index: packfile.c
===================================================================
RCS file: /cvs/public/parrot/src/packfile.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -w -r1.115 -r1.116
--- packfile.c 23 Oct 2003 17:48:59 -0000 1.115
+++ packfile.c 13 Nov 2003 07:33:11 -0000 1.116
@@ -7,7 +7,7 @@
** This program is free software. It is subject to the same
** license as Parrot itself.
**
-** $Id: packfile.c,v 1.115 2003/10/23 17:48:59 robert Exp $
+** $Id: packfile.c,v 1.116 2003/11/13 07:33:11 mrjoltcola Exp $
**
** History:
** Rework by Melvin; new bytecode format, make bytecode portable.
@@ -502,6 +502,10 @@
struct Parrot_Sub *sub;
INTVAL rel;
+#if TRACE_PACKFILE
+ PIO_eprintf(NULL, "fixup_subs\n");
+#endif
+
ft = self->cur_cs->fixups;
ct = self->cur_cs->consts;
for (i = 0; i < ft->fixup_count; i++) {
@@ -2336,6 +2340,9 @@
* finally place the sub in the global stash
*/
key = key_new_cstring(interpreter, name);
+#if TRACE_PACKFILE_PMC
+ fprintf(stderr, "PMC_CONST: store_global: name '%s'\n", name);
+#endif
VTABLE_set_pmc_keyed(interpreter, interpreter->perl_stash->stash_hash,
key, sub_pmc);
@@ -2458,13 +2465,17 @@
char *ext;
const char *mode = NULL;
+#if TRACE_PACKFILE
+ fprintf(stderr, "packfile.c: parrot_load_bytecode()\n");
+#endif
+
ext = strrchr(filename, '.');
if (ext && strcmp (ext, ".pbc") == 0) {
PackFile_append_pbc(interpreter, filename);
}
else {
PMC * compiler, *code;
- PMC *key = key_new_cstring(interpreter, "FILE");
+ PMC *key = key_new_cstring(interpreter, "FILE"); /* see imcc/parser_util.c
*/
PMC *compreg_hash = VTABLE_get_pmc_keyed_int(interpreter,
interpreter->iglobals, IGLOBALS_COMPREG_HASH);
struct PackFile *pf;
@@ -2476,6 +2487,9 @@
return;
}
file = string_from_cstring(interpreter, filename, 0);
+#if TRACE_PACKFILE
+ fprintf(stderr, "packfile.c: VTABLE: compiler->invoke '%s'\n", filename);
+#endif
code = VTABLE_invoke(interpreter, compiler, file);
pf = code->cache.struct_val;
if (pf) {