/* src/cacaoh/headers.c - functions for header generation
- 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: Reinhard Grafl
-
- Changes: Mark Probst
- Philipp Tomsich
- Christian Thalinger
- Edwin Steiner
-
- $Id: headers.c 5251 2006-08-18 13:01:00Z twisti $
+ $Id: headers.c 7228 2007-01-19 01:13:48Z edwin $
*/
# include <ucontext.h>
#endif
-#include "mm/boehm.h"
+#include "mm/gc-common.h"
#include "mm/memory.h"
#include "native/include/java_lang_String.h"
#include "native/include/java_lang_Throwable.h"
/* Invocation API variables ***************************************************/
_Jv_JavaVM *_Jv_jvm; /* denotes a Java VM */
+char *_Jv_bootclasspath;
+
+char *cacao_prefix;
+char *classpath_libdir;
+char *_Jv_classpath;
+char *_Jv_java_library_path;
#if defined(ENABLE_INTRP)
/* dummy interpreter stack to keep the compiler happy */
void vm_abort(const char *text, ...)
{
+ va_list ap;
+
+ /* print the log message */
+
+ va_start(ap, text);
+ vfprintf(stderr, text, ap);
+ va_end(ap);
+
+ /* now abort the VM */
+
abort();
}
/* code patching functions */
void patcher_builtin_arraycheckcast(u1 *sp) {}
-#if defined(__MIPS__)
-long compare_and_swap(long *p, long oldval, long newval)
+
+long compare_and_swap(volatile long *p, long oldval, long newval)
{
if (*p == oldval) {
- *p = newval;
- return oldval;
- } else
- return *p;
+ *p = newval;
+ return oldval;
+ }
+ else
+ return *p;
+
+ return oldval;
+}
+
+long asm_compare_and_swap(volatile long *p, long oldval, long newval)
+{
+ if (*p == oldval) {
+ *p = newval;
+ return oldval;
+ }
+ else
+ return *p;
+
+ return oldval;
+}
+
+void asm_memory_barrier(void)
+{
}
-#endif
u1 *createcompilerstub(methodinfo *m) { return NULL; }
void *asm_switchstackandcall(void *stack, void *func, void **stacktopsave, void * p) { return NULL; }
void asm_handle_builtin_exception(classinfo *c) {}
-void asm_abstractmethoderror(void) {}
#if defined(ENABLE_JIT)
+void asm_abstractmethoderror(void) {}
void asm_getclassvalues_atomic(vftbl_t *super, vftbl_t *sub, castinfo *out) {}
#endif
#if defined(ENABLE_INTRP)
+void intrp_asm_abstractmethoderror(void) {}
void intrp_asm_getclassvalues_atomic(vftbl_t *super, vftbl_t *sub, castinfo *out) {}
#endif
}
void typeinfo_print(FILE *file,typeinfo *info,int indent) {}
+void typeinfo_print_short(FILE *file,typeinfo *info) {}
void exceptions_print_exception(java_objectheader *xptr) {}
+void stacktrace_dump_trace(threadobject *thread) {}
void stacktrace_print_trace(java_objectheader *xptr) {}
java_objectarray *stacktrace_getClassContext() { return NULL; }
void code_free_code_of_method(methodinfo *m) {}
+void jit_invalidate_code(methodinfo *m) {}
+
/* exception functions ********************************************************/
}
-void throw_cacao_exception_exit(const char *exception, const char *message, ...)
-{
- va_list ap;
-
- fprintf(stderr, "%s: ", exception);
-
- va_start(ap, message);
- vfprintf(stderr, message, ap);
- va_end(ap);
-
- fputc('\n', stderr);
-
- exit(1);
-}
-
-
-void exceptions_throw_outofmemory_exit(void)
-{
- fprintf(stderr, "java.lang.InternalError: Out of memory\n");
- exit(1);
-}
-
-
java_objectheader *new_exception(const char *classname)
{
fprintf(stderr, "%s\n", classname);
}
-java_objectheader *new_internalerror(const char *message, ...)
+void exceptions_throw_internalerror(const char *message, ...)
{
va_list ap;
va_end(ap);
exit(1);
+}
- /* keep compiler happy */
- return NULL;
+void exceptions_throw_outofmemoryerror(void)
+{
+ fprintf(stderr, "%s", string_java_lang_OutOfMemoryError);
+ exit(1);
}
}
+void exceptions_throw_virtualmachineerror(void)
+{
+ fprintf(stderr, "%s", string_java_lang_VirtualMachineError);
+ exit(1);
+}
+
+
void exceptions_throw_arrayindexoutofboundsexception(void)
{
fprintf(stderr, "%s", string_java_lang_ArrayIndexOutOfBoundsException);
}
-java_objectheader *new_illegalmonitorstateexception(void)
+java_objectheader *exceptions_throw_illegalmonitorstateexception(void)
{
fprintf(stderr, "%s", string_java_lang_IllegalMonitorStateException);
exit(1);
}
-java_objectheader *new_nullpointerexception(void)
+java_objectheader *exceptions_new_nullpointerexception(void)
{
fprintf(stderr, "%s", string_java_lang_NullPointerException);
exit(1);
void exceptions_throw_nullpointerexception(void)
{
- (void) new_nullpointerexception();
+ (void) exceptions_new_nullpointerexception();
}
/************************ global variables **********************/
+#define ACC_NATIVELY_OVERLOADED 0x10000000
+
chain *ident_chain; /* chain with method and field names in current class */
FILE *file = NULL;
static u4 outputsize;
u4 newsize,i;
if (!dopadding) return;
- newsize = ALIGN(outputsize, len);
+ newsize = MEMORY_ALIGN(outputsize, len);
for (i = outputsize; i < newsize; i++) fprintf(file, " u1 pad%d\n", (int) i);
outputsize = newsize;
fprintf(file, "_");
printID(m->name);
- /* ATTENTION: We use the methodinfo's stackcount variable as
- nativelyoverloaded, so we can save some space during
- runtime. */
+ /* ATTENTION: We use a dummy flag here. */
- if (m->stackcount)
+ if (m->flags & ACC_NATIVELY_OVERLOADED)
printOverloadPart(m->descriptor);
fprintf(file, "(JNIEnv *env");
if (!(m->flags & ACC_NATIVE))
continue;
- /* We use the methodinfo's stackcount variable as
- nativelyoverloaded, so we can save some space during
- runtime. */
+ /* We use a dummy flag here. */
- if (!m->stackcount) {
+ if (!(m->flags & ACC_NATIVELY_OVERLOADED)) {
nativelyoverloaded = false;
for (j = i + 1; j < c->methodscount; j++) {
continue;
if (m->name == m2->name) {
- m2->stackcount = true;
- nativelyoverloaded = true;
+ m2->flags |= ACC_NATIVELY_OVERLOADED;
+ nativelyoverloaded = true;
}
}
}
- m->stackcount = nativelyoverloaded;
+ if (nativelyoverloaded == true)
+ m->flags |= ACC_NATIVELY_OVERLOADED;
}
for (i = 0; i < c->methodscount; i++) {
projects / cacao.git / blobdiff