23bc3a894d
2006-04-28 Bryce McKinlay <mckinlay@redhat.com> * link.cc (_Jv_Linker::resolve_pool_entry): Don't pass vtable_index to resolve_method. * interpret.cc (insn_invokevirtual): Use method->index, not vtable_index. Check accflag FINAL to determine finals. Only do explicit null check if calling a final method. Use throw_null_pointer_exception. (invokevirtual_resolved): Likewise. (null_pointer_exc): Remove static field. (throw_null_pointer_exception): Always define. Throw a new NullPointerException every time. * include/java-interp.h (_Jv_ResolvedMethod): Remove vtable_index field. * include/execution.h (resolve_method): Remove vtable_index argument. From-SVN: r113370
163 lines
3.8 KiB
C++
163 lines
3.8 KiB
C++
// execution.h - Execution engines. -*- c++ -*-
|
|
|
|
/* Copyright (C) 2004, 2006 Free Software Foundation
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
#ifndef __JAVA_EXECUTION_H__
|
|
#define __JAVA_EXECUTION_H__
|
|
|
|
// This represents one execution engine. Note that we use function
|
|
// pointers and not virtual methods to avoid calls to
|
|
// __cxa_call_unexpected and the like.
|
|
struct _Jv_ExecutionEngine
|
|
{
|
|
public:
|
|
|
|
void (*unregister) (jclass);
|
|
// FIXME: probably should handle this elsewhere, see how
|
|
// interpreter does it.
|
|
bool (*need_resolve_string_fields) ();
|
|
void (*verify) (jclass);
|
|
void (*allocate_static_fields) (jclass, int, int);
|
|
void (*create_ncode) (jclass);
|
|
_Jv_ResolvedMethod *(*resolve_method) (_Jv_Method *, jclass,
|
|
jboolean);
|
|
void (*post_miranda_hook) (jclass);
|
|
};
|
|
|
|
// This handles all gcj-compiled code, including BC ABI.
|
|
struct _Jv_CompiledEngine : public _Jv_ExecutionEngine
|
|
{
|
|
public:
|
|
|
|
static void do_unregister (jclass)
|
|
{
|
|
}
|
|
|
|
static bool do_need_resolve_string_fields ()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static void do_verify (jclass klass)
|
|
{
|
|
_Jv_Linker::verify_type_assertions (klass);
|
|
}
|
|
|
|
static _Jv_ResolvedMethod *do_resolve_method (_Jv_Method *, jclass,
|
|
jboolean)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static void do_allocate_static_fields (jclass klass,
|
|
int pointer_size,
|
|
int other_size)
|
|
{
|
|
// Splitting the allocations here lets us scan reference fields
|
|
// and avoid scanning non-reference fields.
|
|
char *reference_fields = (char *) _Jv_AllocRawObj (pointer_size);
|
|
char *non_reference_fields = (char *) _Jv_AllocBytes (other_size);
|
|
|
|
for (int i = 0; i < klass->field_count; i++)
|
|
{
|
|
_Jv_Field *field = &klass->fields[i];
|
|
|
|
if ((field->flags & java::lang::reflect::Modifier::STATIC) == 0)
|
|
continue;
|
|
|
|
char *base = field->isRef() ? reference_fields : non_reference_fields;
|
|
field->u.addr = base + field->u.boffset;
|
|
}
|
|
}
|
|
|
|
static void do_create_ncode (jclass)
|
|
{
|
|
// Not needed.
|
|
}
|
|
|
|
static void do_post_miranda_hook (jclass)
|
|
{
|
|
// Not needed.
|
|
}
|
|
|
|
_Jv_CompiledEngine ()
|
|
{
|
|
unregister = do_unregister;
|
|
need_resolve_string_fields = do_need_resolve_string_fields;
|
|
verify = do_verify;
|
|
allocate_static_fields = do_allocate_static_fields;
|
|
create_ncode = do_create_ncode;
|
|
resolve_method = do_resolve_method;
|
|
post_miranda_hook = do_post_miranda_hook;
|
|
}
|
|
|
|
// These operators make it so we don't have to link in libstdc++.
|
|
void *operator new (size_t bytes)
|
|
{
|
|
return _Jv_Malloc(bytes);
|
|
}
|
|
|
|
void operator delete (void *mem)
|
|
{
|
|
_Jv_Free(mem);
|
|
}
|
|
};
|
|
|
|
// This handles interpreted code.
|
|
class _Jv_InterpreterEngine : public _Jv_ExecutionEngine
|
|
{
|
|
public:
|
|
|
|
static void do_verify (jclass);
|
|
static void do_allocate_static_fields (jclass, int, int);
|
|
static void do_create_ncode (jclass);
|
|
static _Jv_ResolvedMethod *do_resolve_method (_Jv_Method *, jclass,
|
|
jboolean);
|
|
|
|
static bool do_need_resolve_string_fields ()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static void do_unregister(jclass klass)
|
|
{
|
|
_Jv_UnregisterClass(klass);
|
|
}
|
|
|
|
static void do_post_miranda_hook (jclass);
|
|
|
|
_Jv_InterpreterEngine ()
|
|
{
|
|
unregister = do_unregister;
|
|
need_resolve_string_fields = do_need_resolve_string_fields;
|
|
verify = do_verify;
|
|
allocate_static_fields = do_allocate_static_fields;
|
|
create_ncode = do_create_ncode;
|
|
resolve_method = do_resolve_method;
|
|
post_miranda_hook = do_post_miranda_hook;
|
|
}
|
|
|
|
// These operators make it so we don't have to link in libstdc++.
|
|
void *operator new (size_t bytes)
|
|
{
|
|
return _Jv_Malloc(bytes);
|
|
}
|
|
|
|
void operator delete (void *mem)
|
|
{
|
|
_Jv_Free(mem);
|
|
}
|
|
};
|
|
|
|
|
|
extern _Jv_InterpreterEngine _Jv_soleInterpreterEngine;
|
|
extern _Jv_CompiledEngine _Jv_soleCompiledEngine;
|
|
|
|
#endif // __JAVA_EXECUTION_H__
|