Index: MANIFEST =================================================================== RCS file: /cvs/public/parrot/MANIFEST,v retrieving revision 1.607 diff -u -u -r1.607 MANIFEST --- MANIFEST 21 Mar 2004 15:45:59 -0000 1.607 +++ MANIFEST 29 Mar 2004 07:43:15 -0000 @@ -2492,7 +2492,6 @@ src/intlist.c [] src/jit.c [] src/jit_debug.c [] -src/jit_debug_xcoff.c [] src/key.c [] src/list.c [] src/longopt.c [] Index: config/auto/jit.pl =================================================================== RCS file: /cvs/public/parrot/config/auto/jit.pl,v retrieving revision 1.33 diff -u -u -r1.33 jit.pl --- config/auto/jit.pl 8 Mar 2004 08:49:05 -0000 1.33 +++ config/auto/jit.pl 29 Mar 2004 07:43:15 -0000 @@ -42,6 +42,12 @@ $cpuarch = 'ppc'; } + if($cpuarch =~ /aix/) { + # XXX old AIXes on non-PPC hardware will need to change this + $osname = 'aix'; + $cpuarch = 'ppc'; + } + if(($osname =~ /darwin/) || ($archname =~ /powerpc/)) { $cpuarch = 'ppc'; } @@ -100,7 +106,7 @@ jitcapable => 1, cc_hasjit => " -DHAS_JIT -D\U$jitcpuarch", TEMP_jit_h => '$(INC)/jit.h', - TEMP_jit_o => '$(SRC)/jit$(O) $(SRC)/jit_cpu$(O) $(SRC)/jit_debug$(O) $(SRC)/jit_debug_xcoff$(O)' + TEMP_jit_o => '$(SRC)/jit$(O) $(SRC)/jit_cpu$(O) $(SRC)/jit_debug$(O)' ); if (($jitcpuarch eq 'i386') Index: config/gen/makefiles/root.in =================================================================== RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v retrieving revision 1.192 diff -u -u -r1.192 root.in --- config/gen/makefiles/root.in 18 Mar 2004 15:59:37 -0000 1.192 +++ config/gen/makefiles/root.in 29 Mar 2004 07:43:15 -0000 @@ -647,8 +647,6 @@ $(SRC)/jit_debug$(O) : $(GENERAL_H_FILES) ${TEMP_jit_h} -$(SRC)/jit_debug_xcoff$(O) : $(GENERAL_H_FILES) ${TEMP_jit_h} - $(SRC)/jit_cpu$(O): $(GENERAL_H_FILES) ${TEMP_jit_h} $(INC)/jit_emit.h $(SRC)/exec$(O) : $(GENERAL_H_FILES) ${TEMP_exec_h} ${TEMP_jit_h} $(INC)/jit_emit.h Index: src/jit.c =================================================================== RCS file: /cvs/public/parrot/src/jit.c,v retrieving revision 1.85 diff -u -u -r1.85 jit.c --- src/jit.c 26 Mar 2004 18:30:32 -0000 1.85 +++ src/jit.c 29 Mar 2004 07:43:16 -0000 @@ -69,7 +69,7 @@ # endif #endif -#if defined __GNUC__ || defined __IBMC__ +#ifdef __GNUC__ void Parrot_jit_debug(struct Parrot_Interp* interpreter); #endif @@ -1387,7 +1387,7 @@ #endif /* assume gdb is available: generate symbol information */ -#if defined __GNUC__ || defined __IBMC__ +#ifdef __GNUC__ if (Interp_flags_TEST(interpreter, PARROT_DEBUG_FLAG)) Parrot_jit_debug(interpreter); #endif Index: src/jit_debug_xcoff.c =================================================================== RCS file: /cvs/public/parrot/src/jit_debug_xcoff.c,v retrieving revision 1.3 diff -u -u -r1.3 jit_debug_xcoff.c --- src/jit_debug_xcoff.c 26 Jan 2004 23:16:05 -0000 1.3 +++ src/jit_debug_xcoff.c 29 Mar 2004 07:43:16 -0000 @@ -1,383 +0,0 @@ -/* -Copyright: 2001-2003 The Perl Foundation. All Rights Reserved. -$Id: jit_debug_xcoff.c,v 1.3 2004/01/26 23:16:05 mikescott Exp $ - -=head1 NAME - -src/jit_debug_xcoff.c - XCOFF stabs for JIT - -=head1 DESCRIPTION - -Write an XCOFF stabs file for JIT code. This file is based on F. - -Stabs is a file format for information that describes a program to a -debugger. - -For more information see the stabs documentation at -http://sources.redhat.com/gdb/current/onlinedocs/stabs_toc.html. - -=head2 Functions - -=over 4 - -=cut - -*/ - -#include -#include "parrot/exec.h" -#include "parrot/jit.h" - -#ifdef __IBMC__ - -/* following from /usr/include/dbxstclass.h */ -#define C_GSYM "0x80" /* global variable */ -#define C_LSYM "0x81" /* stack variable */ -#define C_PSYM "0x82" /* parameter */ -#define C_RSYM "0x83" /* register variable */ -#define C_RPSYM "0x84" -#define C_STSYM "0x85" /* variable in data section */ -#define C_TCSYM "0x86" -#define C_BCOMM "0x87" -#define C_ECOML "0x88" -#define C_ECOMM "0x89" -#define C_DECL "0x8c" /* type declaration */ -#define C_ENTRY "0x8d" -#define C_FUN "0x8e" -#define C_BSTAT "0x8f" -#define C_ESTAT "0x90" - -void Parrot_jit_debug(struct Parrot_Interp* interpreter); - -# define BIT_SIZE(t) ((int)(sizeof(t)*8)) -# define BYTE_SIZE(t) ((int)sizeof(t)) -# define BIT_OFFSET(str, field) ((int)(offsetof(str, field) * 8)) - -typedef struct { - const char *name; - const char *spec; -} BaseTypes; - -/* - -=item C - -Writes the types to C. - -=cut - -*/ - -static void -write_types(FILE *stabs) -{ - int i, j; - /* borrowed from mono */ - static BaseTypes base_types[] = { - {"Char", "-6"}, - {"Byte", "-5"}, - {"Int16", "-3"}, - {"UInt16", "-7"}, - {"Int32", "-1"}, /* 5 */ - {"UInt32", "-8"}, - {"Int64", ";01000000000000000000000;0777777777777777777777;"}, - {"UInt64", ";0000000000000;01777777777777777777777;"}, - {"Single", "-12"}, - {"Double", "-13"}, /* 10 */ - {"LongDouble", "-14"}, -# if INTVAL_SIZE == 4 - {"INTVAL", "5;"}, /* 12 */ -# else - {"INTVAL", "7;"}, -# endif -# if NUMVAL_SIZE == 8 - {"FLOATVAL", "10;"}, /* 13 */ -# else - {"FLOATVAL", "11;"}, -# endif - {"Ptr", "*0;"}, - {"CharPtr", "*1;"}, /* 15 */ - {0, 0} - }; - for (i = 0; base_types[i].name; ++i) { - if (! base_types[i].spec) - continue; - fprintf (stabs, ".stabx \"%s:t%d=", base_types[i].name, i); - if (base_types[i].spec [0] == ';') { - fprintf (stabs, "r%d%s\"", i, base_types[i].spec); - } - else { - fprintf (stabs, "%s\"", base_types[i].spec); - } - fprintf (stabs, ",0," C_DECL ",0\n"); - } - fprintf(stabs, ".stabx \"STRING:t%d=*%d\"" - ",0," C_DECL ",0\n", i, i+1); - ++i; - fprintf(stabs, ".stabx \"Parrot_String:T%d=s%d" - "bufstart:14,%d,%d;" - "buflen:6,%d,%d;" /* XXX type */ - "flags:12,%d,%d;" - "bufused:12,%d,%d;" - "strstart:15,%d,%d;" /* fake a char* */ - ";\"" - ",0," C_DECL ",0\n", i++, BYTE_SIZE(STRING), - BIT_OFFSET(STRING, bufstart), BIT_SIZE(void*), - BIT_OFFSET(STRING, buflen), BIT_SIZE(size_t), - BIT_OFFSET(STRING, obj.flags), BIT_SIZE(UINTVAL), - BIT_OFFSET(STRING, bufused), BIT_SIZE(UINTVAL), - BIT_OFFSET(STRING, strstart), BIT_SIZE(void*) - ); - - fprintf(stabs, ".stabx \"PMCType:T%d=e", i++); - for (j = 0; j < enum_class_max; ++j) { - if (Parrot_base_vtables[j] && Parrot_base_vtables[j]->whoami) { - STRING* name = Parrot_base_vtables[j]->whoami; - fwrite(name->strstart, name->strlen, 1, stabs); - fprintf(stabs, ":%d,", j); - } - } - fprintf(stabs, ";\",0," C_DECL ",0\n"); - - /* PMC type */ - fprintf(stabs, ".stabx \"PMC:T%d=s%d", i, BYTE_SIZE(PMC)); - fprintf(stabs, "obj:%d,%d,%d;", - i + 1, BIT_OFFSET(PMC, obj), BIT_SIZE(pobj_t)); - fprintf(stabs, "vtable:*%d,%d,%d;", - i + 3, BIT_OFFSET(PMC, vtable), BIT_SIZE(void*)); -#if ! PMC_DATA_IN_EXT - fprintf(stabs, "data:14,%d,%d;", - BIT_OFFSET(PMC, data), BIT_SIZE(void*)); -#endif - fprintf(stabs, "pmc_ext:*%d,%d,%d;", - i, BIT_OFFSET(PMC, pmc_ext), BIT_SIZE(void*)); - fprintf(stabs, ";\""); - fprintf(stabs, ",0," C_DECL ",0\n"); - - fprintf(stabs, ".stabx \"pobj_t:T%d=s%d" - "u:%d,%d,%d;" - "flags:12,%d,%d;" - ";\"" - ",0," C_DECL ",0\n", i + 1, (int)(sizeof(pobj_t)), - i + 2, BIT_OFFSET(pobj_t, u), BIT_SIZE(UnionVal), - BIT_OFFSET(pobj_t, flags), BIT_SIZE(Parrot_UInt) - ); - fprintf(stabs, ".stabx \"UnionVal:T%d=u%d" - "int_val:12,%d,%d;" - "pmc_val:*%d,%d,%d;" - ";\"" - ",0," C_DECL ",0\n", i + 2, BYTE_SIZE(UnionVal), - BIT_OFFSET(UnionVal, int_val), BIT_SIZE(INTVAL), - i, BIT_OFFSET(UnionVal, pmc_val), BIT_SIZE(void*) - ); - fprintf(stabs, ".stabx \"VTABLE:T%d=s%d" - "base_type:%d,%d,%d;" - ";\"" - ",0," C_DECL ",0\n", i + 3, BYTE_SIZE(UnionVal), - i - 1, BIT_OFFSET(VTABLE, base_type), BIT_SIZE(INTVAL) - ); - i += 4; - -} - -/* - -=item C - -Writes the contents of the registers to C. - -=cut - -*/ - -static void -write_vars(FILE *stabs, struct Parrot_Interp *interpreter) -{ - int i; - /* fake static var stabs */ - fprintf(stabs, ".bs parrot_jit_vars\n"); - for (i = 0; i < NUM_REGISTERS; i++) { - fprintf(stabs, ".stabx \"I%d:V12\",0x%p," C_STSYM ",0\n", i, - (char*)&interpreter->int_reg.registers[i]); - fprintf(stabs, ".stabx \"N%d:V13\",0x%p," C_STSYM ",0\n", i, - (char*)&interpreter->num_reg.registers[i]); - fprintf(stabs, ".stabx \"S%d:V16\",0x%p," C_STSYM ",0\n", i, - (char*)&interpreter->string_reg.registers[i]); - fprintf(stabs, ".stabx \"P%d:V19\",0x%p," C_STSYM ",0\n", i, - (char*)&interpreter->pmc_reg.registers[i]); - } - fprintf(stabs, ".es\n"); -} - -/* - -=item C - -Returns C with C appended. - -=cut - -*/ - -static STRING * -debug_file(struct Parrot_Interp *interpreter, STRING *file, const char *ext) -{ - STRING *ret; - ret = string_copy(interpreter, file); - ret = string_append(interpreter, ret, - string_make(interpreter, ext, strlen(ext), 0, - PObj_external_FLAG, 0), - 0); - return ret; -} - -/* - -=item C - -Writes the JIT debugging stabs. - -=cut - -*/ - -static void -Parrot_jit_debug_stabs(struct Parrot_Interp *interpreter) -{ - Parrot_jit_info_t *jit_info = interpreter->jit_info; - STRING *file = interpreter->current_file; - STRING *pasmfile, *stabsfile, *ofile, *cmd; - FILE *stabs; - size_t i; - int line; - opcode_t lc; - - if (interpreter->code->cur_cs->debugs) { - char *ext; - char *src = interpreter->code->cur_cs->debugs->filename; - pasmfile = string_make(interpreter, src, strlen(src), NULL, - PObj_external_FLAG, NULL); - file = string_copy(interpreter, pasmfile); - /* chop pasm/imc */ - - ext = strrchr(src, '.'); - if (ext && strcmp (ext, ".pasm") == 0) - file = string_chopn(file, 4); - else if (ext && strcmp (ext, ".imc") == 0) - file = string_chopn(file, 3); - else if (!ext) /* EVAL_n */ - file = string_append(interpreter, file, - string_make(interpreter, ".", 1, 0, PObj_external_FLAG, 0), - 0); - } - else { - /* chop pbc */ - file = string_chopn(file, 3); - pasmfile = debug_file(interpreter, file, "pasm"); - } - stabsfile = debug_file(interpreter, file, "stabs.s"); - ofile = debug_file(interpreter, file, "o"); - { - char *temp = string_to_cstring(interpreter,stabsfile); - stabs = fopen(temp, "w"); - free(temp); - } - if (stabs == NULL) - return; - - { - char *temp = string_to_cstring(interpreter, pasmfile); - /* filename info */ - fprintf(stabs, ".file \"%s\"\n",temp); - free(temp); - } - /* declare function name */ - fprintf(stabs, ".jit_func:\n" ); - /* jit_func start addr */ - fprintf(stabs, ".stabx \"jit_func:F1\",0x%p," C_FUN ",0\n", - jit_info->arena.start); - fprintf(stabs, ".function .jit_func,.jit_func,0,0\n" ); - fprintf(stabs, ".bf 1\n" ); - - write_types(stabs); - write_vars(stabs, interpreter); - /* if we don't have line numbers, emit dummys, assuming there are - * no comments and spaces in source for testing - */ - - /* jit_begin */ - fprintf(stabs, ".line 1\n"); - line = 1; - lc = 0; - for (i = 0; i < jit_info->arena.map_size; i++) { - if (jit_info->arena.op_map[i].ptr) { - op_info_t* op = &interpreter->op_info_table[interpreter->code->byte_code[i]]; - if (interpreter->code->cur_cs->debugs) { - line = (int)interpreter->code->cur_cs->debugs->base.data[lc++]; - } - fprintf(stabs, ".line %d # 0x%p %s\n", line, - (int)((char *)jit_info->arena.op_map[i].ptr - - (char *)jit_info->arena.start), - op->full_name); - line++; - } - } - /* eof */ - fprintf(stabs, ".stabx \"\",0x%p," C_FUN ",0\n", - (char *) jit_info->arena.size); - fprintf(stabs, ".ef %d\n",line); - fclose(stabs); - /* run the stabs file through C generating file.o */ - cmd = Parrot_sprintf_c(interpreter, "as %Ss -o %Ss", stabsfile, ofile); - - { - char *temp = string_to_cstring(interpreter, cmd); - system(temp); - free(temp); - } -} - -/* - -=item C - -Writes the JIT debugging stabs. Just calls C. - -=cut - -*/ - -void -Parrot_jit_debug(struct Parrot_Interp* interpreter) -{ - Parrot_jit_debug_stabs(interpreter); -} - -#endif - - -/* - -=back - -=head1 SEE ALSO - -F, F, F. - -=cut - -*/ - -/* - * Local variables: - * c-indentation-style: bsd - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - * - * vim: expandtab shiftwidth=4: -*/ Index: src/mmd.c =================================================================== RCS file: /cvs/public/parrot/src/mmd.c,v retrieving revision 1.24 diff -u -u -r1.24 mmd.c --- src/mmd.c 26 Mar 2004 15:48:48 -0000 1.24 +++ src/mmd.c 29 Mar 2004 07:43:16 -0000 @@ -87,7 +87,8 @@ /* Didn't find it. Go look for a bytecode version */ offset = interpreter->binop_mmd_funcs->x[function] * right_type + left_type; - sub = (pmc_mmd_f)*(interpreter->bytecode_binop_mmd_funcs->mmd_funcs[function] + offset); + sub = (PMC*)((pmc_mmd_f) + *(interpreter->bytecode_binop_mmd_funcs->mmd_funcs[function] + offset)); } }