procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jvm.h (_Jv_Linker::maybe_adjust_signature): New.

Browse source 
2006-06-07  Andrew Haley  <aph@redhat.com>

        * include/jvm.h (_Jv_Linker::maybe_adjust_signature): New.
        (_Jv_Linker::uaddr): New.
        * link.cc (resolve_pool_entry): Call search_method_in_superclasses
        instead of an open-coded loop around search_method_in_class.
        (search_method_in_class): Add a new arg, check_perms.
        (search_method_in_superclasses): New.
        (link_symbol_table): Call maybe_adjust_signature() to extract the
        least significnt bit of the signature pointer.  Do this three
        times, for instace method calls, static methods, and interfaces.
        Call search_method_in_superclasses() instead of
        _Jv_LookupDeclaredMethod.
        (typedef uaddr): Delete.

From-SVN: r114486
This commit is contained in:
Andrew Haley 2006-06-08 14:00:43 +00:00 • committed by Andrew Haley
parent f70b22c942
commit 297750da03
3 changed files with 104 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libjava/include/jvm.h
View file

@ -239,6 +239,8 @@ namespace gcj
class _Jv_Linker
{
private:
typedef unsigned int uaddr __attribute__ ((mode (pointer)));
static _Jv_Field *find_field_helper(jclass, _Jv_Utf8Const *, _Jv_Utf8Const *,
jclass, jclass *);
static _Jv_Field *find_field(jclass, jclass, jclass *, _Jv_Utf8Const *,
@ -264,9 +266,32 @@ private:
static jshort append_partial_itable(jclass, jclass, void **, jshort);
static _Jv_Method *search_method_in_class (jclass, jclass,
_Jv_Utf8Const *,
_Jv_Utf8Const *);
_Jv_Utf8Const *,
bool check_perms = true);
static _Jv_Method *search_method_in_superclasses (jclass cls, jclass klass,
_Jv_Utf8Const *method_name,
_Jv_Utf8Const *method_signature,
jclass *found_class,
bool check_perms = true);
static void *create_error_method(_Jv_Utf8Const *);
/* The least significant bit of the signature pointer in a symbol
table is set to 1 by the compiler if the reference is "special",
i.e. if it is an access to a private field or method. Extract
that bit, clearing it in the address and setting the LSB of
SPECIAL accordingly. */
static void maybe_adjust_signature (_Jv_Utf8Const *&s, uaddr &special)
{
union {
_Jv_Utf8Const *signature;
uaddr signature_bits;
};
signature = s;
special = signature_bits & 1;
signature_bits -= special;
s = signature;
}
public:
static bool has_field_p (jclass, _Jv_Utf8Const *);