* src/vm/jit/intrp/intrp.h: Likewise.
* src/vm/jit/intrp/codegen.c: Likewise.
* src/vm/jit/intrp/engine.c: Likewise.
* src/vm/jit/intrp/asmpart.c: Likewise.
* src/vm/jit/intrp/dynamic-super.c: Likewise.
* src/vm/jit/intrp/patcher.c: Likewise.
* src/vm/jit/intrp/java.vmg: Likewise.
##
## Contact: cacao@cacaojvm.org
##
-## $Id: Makefile.am 7338 2007-02-13 00:17:22Z twisti $
+## $Id: Makefile.am 7356 2007-02-14 11:00:28Z twisti $
## Process this file with automake to produce Makefile.in
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: boehm.c 7309 2007-02-09 12:51:00Z twisti $
+ $Id: boehm.c 7355 2007-02-14 10:57:32Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: memory.c 7341 2007-02-13 00:51:01Z twisti $
+ $Id: memory.c 7356 2007-02-14 11:00:28Z twisti $
*/
Changes: Christian Thalinger
- $Id: memory.h 7338 2007-02-13 00:17:22Z twisti $
+ $Id: memory.h 7356 2007-02-14 11:00:28Z twisti $
*/
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7305 2007-02-09 11:08:14Z twisti $
+## $Id: Makefile.am 7355 2007-02-14 10:57:32Z twisti $
## Process this file with automake to produce Makefile.in
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: native.c 7328 2007-02-11 21:22:07Z twisti $
+ $Id: native.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: native.h 7328 2007-02-11 21:22:07Z twisti $
+ $Id: native.h 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: java_lang_VMRuntime.c 7306 2007-02-09 11:25:08Z twisti $
+ $Id: java_lang_VMRuntime.c 7355 2007-02-14 10:57:32Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: java_lang_reflect_Method.c 7328 2007-02-11 21:22:07Z twisti $
+ $Id: java_lang_reflect_Method.c 7356 2007-02-14 11:00:28Z twisti $
*/
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7338 2007-02-13 00:17:22Z twisti $
+## $Id: Makefile.am 7356 2007-02-14 11:00:28Z twisti $
## Process this file with automake to produce Makefile.in
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7338 2007-02-13 00:17:22Z twisti $
+## $Id: Makefile.am 7356 2007-02-14 11:00:28Z twisti $
## Process this file with automake to produce Makefile.in
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: threads.c 7338 2007-02-13 00:17:22Z twisti $
+ $Id: threads.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: threads.h 7338 2007-02-13 00:17:22Z twisti $
+ $Id: threads.h 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: logging.c 7345 2007-02-13 13:04:21Z twisti $
+ $Id: logging.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: builtin.h 7316 2007-02-10 19:06:54Z twisti $
+ $Id: builtin.h 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: finalizer.c 7343 2007-02-13 02:36:29Z ajordan $
+ $Id: finalizer.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: abi.h 7329 2007-02-11 21:24:14Z twisti $
+ $Id: abi.h 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: disass.c 7335 2007-02-12 10:43:33Z twisti $
+ $Id: disass.c 7356 2007-02-14 11:00:28Z twisti $
*/
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7304 2007-02-09 10:35:26Z twisti $
+## $Id: Makefile.am 7355 2007-02-14 10:57:32Z twisti $
## Process this file with automake to produce Makefile.in
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7304 2007-02-09 10:35:26Z twisti $
+## $Id: Makefile.am 7355 2007-02-14 10:57:32Z twisti $
## Process this file with automake to produce Makefile.in
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: md-abi.c 7335 2007-02-12 10:43:33Z twisti $
+ $Id: md-abi.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: md-abi.h 7316 2007-02-10 19:06:54Z twisti $
+ $Id: md-abi.h 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: md.c 7304 2007-02-09 10:35:26Z twisti $
+ $Id: md.c 7355 2007-02-14 10:57:32Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: asmpart.S 7325 2007-02-11 20:10:35Z twisti $
+ $Id: asmpart.S 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: codegen.c 7353 2007-02-13 23:14:35Z twisti $
+ $Id: codegen.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: disass.c 7333 2007-02-11 22:17:27Z twisti $
+ $Id: disass.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: md-abi.c 7353 2007-02-13 23:14:35Z twisti $
+ $Id: md-abi.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: asmpart.h 7338 2007-02-13 00:17:22Z twisti $
+ $Id: asmpart.h 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: disass.h 7331 2007-02-11 21:41:19Z twisti $
+ $Id: disass.h 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: asmpart.S 7310 2007-02-09 13:00:04Z twisti $
+ $Id: asmpart.S 7355 2007-02-14 10:57:32Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: emit.c 7316 2007-02-10 19:06:54Z twisti $
+ $Id: emit.c 7356 2007-02-14 11:00:28Z twisti $
*/
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7301 2007-02-08 12:14:49Z twisti $
+## $Id: Makefile.am 7355 2007-02-14 10:57:32Z twisti $
## Process this file with automake to produce Makefile.in
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7301 2007-02-08 12:14:49Z twisti $
+## $Id: Makefile.am 7355 2007-02-14 10:57:32Z twisti $
## Process this file with automake to produce Makefile.in
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: md-abi.c 7334 2007-02-12 00:34:51Z twisti $
+ $Id: md-abi.c 7356 2007-02-14 11:00:28Z twisti $
*/
/* src/vm/jit/intrp/asmpart.c - Java-C interface functions for Interpreter
- Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+ Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
J. Wenninger, Institut f. Computersprachen - TU Wien
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Christian Thalinger
- Anton Ertl
-
- Changes: Edwin Steiner
-
- $Id: asmpart.c 5812 2006-10-20 14:22:23Z twisti $
+ $Id: asmpart.c 7357 2007-02-14 11:35:59Z twisti $
*/
#include "arch.h"
+#if defined(ENABLE_THREADS)
+# include "threads/native/threads.h"
+#else
+# include "threads/none/threads.h"
+#endif
+
#include "vm/builtin.h"
-#include "vm/class.h"
#include "vm/exceptions.h"
-#include "vm/loader.h"
-#include "vm/options.h"
+
#include "vm/jit/asmpart.h"
#include "vm/jit/methodheader.h"
#include "vm/jit/intrp/intrp.h"
#include "vm/jit/dseg.h"
+#include "vmcore/class.h"
+#include "vmcore/loader.h"
+#include "vmcore/options.h"
+
static bool intrp_asm_vm_call_method_intern(methodinfo *m, s4 vmargscount,
vm_arg *vmargs)
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Christian Thalinger
- Anton Ertl
- Edwin Steiner
-
- $Id: codegen.c 6286 2007-01-10 10:03:38Z twisti $
+ $Id: codegen.c 7357 2007-02-14 11:35:59Z twisti $
*/
#include "vm/jit/intrp/codegen.h"
#include "vm/jit/intrp/intrp.h"
+#include "mm/memory.h"
+
#include "native/native.h"
+
#include "vm/builtin.h"
-#include "vm/class.h"
#include "vm/exceptions.h"
#include "vm/global.h"
-#include "vm/options.h"
#include "vm/stringlocal.h"
#include "vm/vm.h"
+
#include "vm/jit/asmpart.h"
#include "vm/jit/codegen-common.h"
#include "vm/jit/dseg.h"
#include "vm/jit/parse.h"
#include "vm/jit/patcher.h"
#include "vm/jit/stack.h"
+#include "vm/jit/stacktrace.h"
+
+#include "vmcore/class.h"
+#include "vmcore/options.h"
#define gen_branch(_inst) { \
/* create method header */
- (void) dseg_addaddress(cd, jd->code); /* CodeinfoPointer */
- (void) dseg_adds4(cd, cd->stackframesize * SIZEOF_VOID_P); /* FrameSize */
+ (void) dseg_add_unique_address(cd, jd->code);
+ (void) dseg_add_unique_s4(cd, cd->stackframesize * SIZEOF_VOID_P);
#if defined(ENABLE_THREADS)
if (checksync && (m->flags & ACC_SYNCHRONIZED))
- (void) dseg_adds4(cd, 1); /* IsSync */
+ (void) dseg_add_unique_s4(cd, 1);
else
#endif
- (void) dseg_adds4(cd, 0); /* IsSync */
+ (void) dseg_add_unique_s4(cd, 0);
- (void) dseg_adds4(cd, 0); /* IsLeaf */
- (void) dseg_adds4(cd, 0); /* IntSave */
- (void) dseg_adds4(cd, 0); /* FltSave */
+ (void) dseg_add_unique_s4(cd, 0);
+ (void) dseg_add_unique_s4(cd, 0);
+ (void) dseg_add_unique_s4(cd, 0);
dseg_addlinenumbertablesize(cd);
- (void) dseg_adds4(cd, jd->exceptiontablelength); /* ExTableSize */
+ (void) dseg_add_unique_s4(cd, jd->exceptiontablelength);
/* create exception table */
for (ex = jd->exceptiontable; ex != NULL; ex = ex->down) {
- dseg_addtarget(cd, ex->start);
- dseg_addtarget(cd, ex->end);
- dseg_addtarget(cd, ex->handler);
- (void) dseg_addaddress(cd, ex->catchtype.any);
+ dseg_add_target(cd, ex->start);
+ dseg_add_target(cd, ex->end);
+ dseg_add_target(cd, ex->handler);
+ (void) dseg_add_unique_address(cd, ex->catchtype.any);
}
#if 0
table += i;
while (--i >= 0) {
- dseg_addtarget(cd, BLOCK_OF(table->insindex));
+ dseg_add_target(cd, BLOCK_OF(table->insindex));
--table;
}
}
- /* length of dataseg after last dseg_addtarget is used by load */
+ /* length of dataseg after last dseg_add_target is used by load */
((ptrint *)(cd->mcodeptr))[-2] = (ptrint) -(cd->dseglen);
break;
/* build jump table top down and use address of lowest entry */
while (--i >= 0) {
- dseg_addtarget(cd, BLOCK_OF(lookup->target.insindex));
- dseg_addaddress(cd, lookup->value);
+ dseg_add_target(cd, BLOCK_OF(lookup->target.insindex));
+ dseg_add_unique_address(cd, lookup->value);
lookup++;
}
codegen_addreference(cd, BLOCK_OF(iptr->sx.s23.s3.lookupdefault.insindex));
}
- /* length of dataseg after last dseg_addtarget is used by load */
+ /* length of dataseg after last dseg_add_target is used by load */
((ptrint *)(cd->mcodeptr))[-2] = (ptrint) -(cd->dseglen);
break;
*******************************************************************************/
-#define COMPILERSTUB_DATASIZE 1
+#define COMPILERSTUB_DATASIZE 2
#define COMPILERSTUB_CODESIZE 4
#define COMPILERSTUB_SIZE COMPILERSTUB_DATASIZE + COMPILERSTUB_CODESIZE
Inst *s;
Inst *d;
codegendata *cd;
- codeinfo *code;
s4 dumpsize;
s4 stackframesize;
d = s;
s = s + COMPILERSTUB_DATASIZE;
- /* Store the codeinfo pointer in the same place as in the
- methodheader for compiled methods. */
+ /* The codeinfo pointer is actually a pointer to the
+ methodinfo. This fakes a codeinfo structure. */
- code = code_codeinfo_new(m);
- d[0] = (Inst *) code;
+ d[0] = (Inst *) m;
+ d[1] = (Inst *) &d[0]; /* fake code->m */
/* mark start of dump memory area */
/* get required compiler data */
- m = jd->m;
- cd = jd->cd;
- rd = jd->rd;
+ m = jd->m;
+ code = jd->code;
+ cd = jd->cd;
+ rd = jd->rd;
/* determine stackframe size (in units of ptrint) */
/* create method header */
- /* Store the codeinfo pointer in the same place as in the
- methodheader for compiled methods. */
-
- code = code_codeinfo_new(m);
-
- (void) dseg_addaddress(cd, code); /* CodeinfoPointer */
- (void) dseg_adds4(cd, stackframesize * SIZEOF_VOID_P); /* FrameSize */
- (void) dseg_adds4(cd, 0); /* IsSync */
- (void) dseg_adds4(cd, 0); /* IsLeaf */
- (void) dseg_adds4(cd, 0); /* IntSave */
- (void) dseg_adds4(cd, 0); /* FltSave */
+ (void) dseg_add_unique_address(cd, code); /* CodeinfoPointer */
+ (void) dseg_add_unique_s4(cd, stackframesize * SIZEOF_VOID_P); /*FrameSize*/
+ (void) dseg_add_unique_s4(cd, 0); /* IsSync */
+ (void) dseg_add_unique_s4(cd, 0); /* IsLeaf */
+ (void) dseg_add_unique_s4(cd, 0); /* IntSave */
+ (void) dseg_add_unique_s4(cd, 0); /* FltSave */
dseg_addlinenumbertablesize(cd);
- (void) dseg_adds4(cd, 0); /* ExTableSize */
+ (void) dseg_add_unique_s4(cd, 0); /* ExTableSize */
#if defined(WITH_FFI)
/* prepare ffi cif structure */
/* create method header */
- (void) dseg_addaddress(cd, NULL); /* CodeinfoPointer */
- (void) dseg_adds4(cd, md->paramslots * SIZEOF_VOID_P); /* FrameSize */
- (void) dseg_adds4(cd, 0); /* IsSync */
- (void) dseg_adds4(cd, 0); /* IsLeaf */
- (void) dseg_adds4(cd, 0); /* IntSave */
- (void) dseg_adds4(cd, 0); /* FltSave */
+ (void) dseg_add_unique_address(cd, NULL); /* CodeinfoPointer */
+ (void) dseg_add_unique_s4(cd, md->paramslots * SIZEOF_VOID_P);/* FrameSize*/
+ (void) dseg_add_unique_s4(cd, 0); /* IsSync */
+ (void) dseg_add_unique_s4(cd, 0); /* IsLeaf */
+ (void) dseg_add_unique_s4(cd, 0); /* IntSave */
+ (void) dseg_add_unique_s4(cd, 0); /* FltSave */
dseg_addlinenumbertablesize(cd);
- (void) dseg_adds4(cd, 0); /* ExTableSize */
+ (void) dseg_add_unique_s4(cd, 0); /* ExTableSize */
/* generate code */
Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
Taken from Gforth.
- Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+ Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
J. Wenninger, Institut f. Computersprachen - TU Wien
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Christian Thalinger
- Anton Ertl
-
- Changes:
-
- $Id: dynamic-super.c 5700 2006-10-05 19:36:21Z edwin $
+ $Id: dynamic-super.c 7357 2007-02-14 11:35:59Z twisti $
*/
#include <stdlib.h>
#include <assert.h>
+#include "vm/types.h"
+
#include "mm/memory.h"
#if defined(ENABLE_THREADS)
# include "threads/native/lock.h"
#endif
+#include "toolbox/hashtable.h"
#include "toolbox/logging.h"
-#include "vm/hashtable.h"
-#include "vm/options.h"
-#include "vm/types.h"
+
#include "vm/jit/disass.h"
#include "vm/jit/intrp/intrp.h"
+#include "vmcore/options.h"
+
s4 no_super=0; /* option: just use replication, but no dynamic superinsts */
/* src/vm/jit/intrp/engine.c - #included by engine1.c and engine2.c
- Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+ Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
J. Wenninger, Institut f. Computersprachen - TU Wien
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Christian Thalinger
- Anton Ertl
-
- Changes: Edwin Steiner
-
- $Id: engine.c 5835 2006-10-26 11:29:42Z edwin $
+ $Id: engine.c 7357 2007-02-14 11:35:59Z twisti $
*/
-#define VM_DEBUG
+/* #define VM_DEBUG */
#include "config.h"
#include <assert.h>
+#include "vm/types.h"
+
#include "arch.h"
+
#include "vm/jit/intrp/intrp.h"
#include "md-abi.h" /* required for TRACE_ARGS_NUM */
+#if defined(ENABLE_THREADS)
+# include "threads/native/threads.h"
+#else
+# include "threads/none/threads.h"
+#endif
+
#include "vm/builtin.h"
#include "vm/exceptions.h"
-#include "vm/loader.h"
-#include "vm/options.h"
+
#include "vm/jit/methodheader.h"
#include "vm/jit/patcher.h"
+#include "vm/jit/stacktrace.h"
+
+#include "vmcore/loader.h"
+#include "vmcore/options.h"
+
#if defined(ENABLE_THREADS)
# ifndef USE_FAKE_ATOMIC_INSTRUCTIONS
/* src/vm/jit/intrp/intrp.h - definitions for Interpreter
- Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+ Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
J. Wenninger, Institut f. Computersprachen - TU Wien
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Christian Thalinger
- Anton Ertl
-
- Changes: Edwin Steiner
-
- $Id: intrp.h 6204 2006-12-16 20:51:32Z edwin $
+ $Id: intrp.h 7357 2007-02-14 11:35:59Z twisti $
*/
#include <stdio.h>
#include "vm/types.h"
+
#include "arch.h"
/* we need Cell in some headers below */
typedef s4 Cell;
#endif
-#include "vm/class.h"
#include "vm/global.h"
-#include "vm/method.h"
-#include "vm/references.h"
-#include "vm/resolve.h"
+
#include "vm/jit/codegen-common.h"
+#include "vmcore/class.h"
+#include "vmcore/method.h"
+#include "vmcore/references.h"
+#include "vmcore/resolve.h"
+
typedef void *Label;
typedef void *Inst;
float f;
vm_Cell2f(v,f);
#if !defined(NDEBUG)
-builtin_displaymethodstop(am, (s8) v, f, f);
+builtin_verbosecall_exit((s8) v, f, f, am);
#endif
}
if (*exceptionptr)
ofs -= SIZEOF_VOID_P;
}
}
- builtin_trace_args(args[0], args[1], args[2], args[3],
+ builtin_verbosecall_enter(args[0], args[1], args[2], args[3],
#if TRACE_ARGS_NUM > 4
- args[4], args[5],
+ args[4], args[5],
#endif
#if TRACE_ARGS_NUM == 8
- args[6], args[7],
+ args[6], args[7],
#endif
- am);
+ am);
}
#else /* SIZEOF_VOID_P */
- builtin_trace_args(
+ builtin_verbosecall_enter(
access_local_cell(0 * -SIZEOF_VOID_P),
access_local_cell(1 * -SIZEOF_VOID_P),
access_local_cell(2 * -SIZEOF_VOID_P),
float f;
vm_Cell2f(v,f);
#if !defined(NDEBUG)
-builtin_displaymethodstop(am, (s8) v, f, f);
+builtin_verbosecall_exit((s8) v, f, f, am);
#endif
TRACELRETURN ( #am l -- l )
Double_Store ds;
ds.l = l;
#if !defined(NDEBUG)
-builtin_displaymethodstop(am, l, ds.d, ds.d);
+builtin_verbosecall_exit(l, ds.d, ds.d, am);
#endif
END ( ... -- )
/* src/vm/jit/intrp/patcher.c - Interpreter code patching functions
- Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+ Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
J. Wenninger, Institut f. Computersprachen - TU Wien
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Contact: cacao@cacaojvm.org
-
- Authors: Christian Thalinger
-
- Changes: Edwin Steiner
-
- $Id: patcher.c 5666 2006-10-04 15:04:52Z twisti $
+ $Id: patcher.c 7357 2007-02-14 11:35:59Z twisti $
*/
#include "vm/types.h"
#include "mm/memory.h"
+
#include "native/native.h"
+
#include "vm/builtin.h"
-#include "vm/class.h"
-#include "vm/field.h"
#include "vm/initialize.h"
-#include "vm/options.h"
-#include "vm/resolve.h"
-#include "vm/references.h"
+
#include "vm/jit/asmpart.h"
#include "vm/jit/patcher.h"
+#include "vmcore/class.h"
+#include "vmcore/field.h"
+#include "vmcore/options.h"
+#include "vmcore/resolve.h"
+#include "vmcore/references.h"
+
/* patcher_get_putstatic *******************************************************
*/
+#include "config.h"
+
#include <assert.h>
#include <stdlib.h>
#include "vm/jit/intrp/intrp.h"
-#include "vm/options.h"
+#include "vmcore/options.h"
/* the numbers in this struct are primitive indices */
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: disass.c 7351 2007-02-13 21:32:36Z twisti $
+ $Id: disass.c 7356 2007-02-14 11:00:28Z twisti $
*/
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7316 2007-02-10 19:06:54Z twisti $
+## $Id: Makefile.am 7356 2007-02-14 11:00:28Z twisti $
## Process this file with automake to produce Makefile.in
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7316 2007-02-10 19:06:54Z twisti $
+## $Id: Makefile.am 7356 2007-02-14 11:00:28Z twisti $
## Process this file with automake to produce Makefile.in
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: md-abi.c 7351 2007-02-13 21:32:36Z twisti $
+ $Id: md-abi.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: md-abi.h 7350 2007-02-13 21:30:13Z twisti $
+ $Id: md-abi.h 7356 2007-02-14 11:00:28Z twisti $
*/
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7308 2007-02-09 12:49:42Z twisti $
+## $Id: Makefile.am 7355 2007-02-14 10:57:32Z twisti $
## Process this file with automake to produce Makefile.in
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
##
-## $Id: Makefile.am 7308 2007-02-09 12:49:42Z twisti $
+## $Id: Makefile.am 7355 2007-02-14 10:57:32Z twisti $
## Process this file with automake to produce Makefile.in
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: md-abi.c 7330 2007-02-11 21:39:54Z twisti $
+ $Id: md-abi.c 7356 2007-02-14 11:00:28Z twisti $
*/
Changes:
- $Id: md-abi.h 7316 2007-02-10 19:06:54Z twisti $
+ $Id: md-abi.h 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: arch.h 7312 2007-02-10 00:49:37Z pm $
+ $Id: arch.h 7356 2007-02-14 11:00:28Z twisti $
*/
Changes: Edwin Steiner
- $Id: asmpart.S 7323 2007-02-11 17:52:12Z pm $
+ $Id: asmpart.S 7356 2007-02-14 11:00:28Z twisti $
*/
Christian Ullrich
Edwin Steiner
- $Id: codegen.c 7323 2007-02-11 17:52:12Z pm $
+ $Id: codegen.c 7356 2007-02-14 11:00:28Z twisti $
*/
Authors: Andreas Krall
Christian Thalinger
- $Id: codegen.h 7323 2007-02-11 17:52:12Z pm $
+ $Id: codegen.h 7356 2007-02-14 11:00:28Z twisti $
*/
Authors: Christian Thalinger
- $Id: emit.c 7300 2007-02-07 22:06:53Z pm $
+ $Id: emit.c 7355 2007-02-14 10:57:32Z twisti $
*/
Changes:
- $Id: md-asm.h 7300 2007-02-07 22:06:53Z pm $
+ $Id: md-asm.h 7355 2007-02-14 10:57:32Z twisti $
*/
Changes: Edwin Steiner
- $Id: md.c 7323 2007-02-11 17:52:12Z pm $
+ $Id: md.c 7356 2007-02-14 11:00:28Z twisti $
*/
Changes:
- $Id: patcher.c 7323 2007-02-11 17:52:12Z pm $
+ $Id: patcher.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: stacktrace.c 7343 2007-02-13 02:36:29Z ajordan $
+ $Id: stacktrace.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: emit.c 7317 2007-02-11 00:02:54Z twisti $
+ $Id: emit.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: md-abi.h 7317 2007-02-11 00:02:54Z twisti $
+ $Id: md-abi.h 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: signal.c 7344 2007-02-13 12:23:54Z ajordan $
+ $Id: signal.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: class.h 7307 2007-02-09 12:47:10Z twisti $
+ $Id: class.h 7355 2007-02-14 10:57:32Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: descriptor.c 7329 2007-02-11 21:24:14Z twisti $
+ $Id: descriptor.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: descriptor.h 7329 2007-02-11 21:24:14Z twisti $
+ $Id: descriptor.h 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: options.c 7338 2007-02-13 00:17:22Z twisti $
+ $Id: options.c 7356 2007-02-14 11:00:28Z twisti $
*/
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: options.h 7338 2007-02-13 00:17:22Z twisti $
+ $Id: options.h 7356 2007-02-14 11:00:28Z twisti $
*/
projects / cacao.git / commitdiff