From 9ca8c34642db3a1c3264f522c97d93fb411920a2 Mon Sep 17 00:00:00 2001 From: twisti Date: Tue, 29 Mar 2005 22:21:46 +0000 Subject: [PATCH] - changes header includes - use cacao types instead of jni ones --- src/vm/jit/asmpart.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/vm/jit/asmpart.h b/src/vm/jit/asmpart.h index c4188ff46..f5a21dade 100644 --- a/src/vm/jit/asmpart.h +++ b/src/vm/jit/asmpart.h @@ -29,7 +29,7 @@ Changes: Christian Thalinger - $Id: asmpart.h 2065 2005-03-23 11:21:00Z twisti $ + $Id: asmpart.h 2126 2005-03-29 22:21:46Z twisti $ */ @@ -37,9 +37,6 @@ #ifndef _ASMPART_H #define _ASMPART_H -#include "native/jni.h" -#include "vm/global.h" - #if defined(USE_THREADS) # if defined(NATIVE_THREADS) # include "threads/native/threads.h" @@ -48,6 +45,8 @@ # endif #endif +#include "vm/jit/stacktrace.h" + typedef struct castinfo castinfo; @@ -96,10 +95,10 @@ s4 asm_calljavafunction_int(methodinfo *m, void *arg1, void *arg2, also supports a return value */ java_objectheader *asm_calljavafunction2(methodinfo *m, u4 count, u4 size, void *callblock); -jint asm_calljavafunction2int(methodinfo *m, u4 count, u4 size, void *callblock); -jlong asm_calljavafunction2long(methodinfo *m, u4 count, u4 size, void *callblock); -jfloat asm_calljavafunction2float(methodinfo *m, u4 count, u4 size, void *callblock); -jdouble asm_calljavafunction2double(methodinfo *m, u4 count, u4 size, void *callblock); +s4 asm_calljavafunction2int(methodinfo *m, u4 count, u4 size, void *callblock); +s8 asm_calljavafunction2long(methodinfo *m, u4 count, u4 size, void *callblock); +float asm_calljavafunction2float(methodinfo *m, u4 count, u4 size, void *callblock); +double asm_calljavafunction2double(methodinfo *m, u4 count, u4 size, void *callblock); /* We need these two labels in codegen.inc to add the asm_calljavafunction*'s into the methodtable */ -- 2.25.1