OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

decl2.c (acceptable_java_type): Allow references too.

Browse Source 
2001-01-07  Alexandre Petit-Bianco  <apbianco@cygnus.com>

        * decl2.c (acceptable_java_type): Allow references too.
        * init.c (build_java_class_ref): When using the new ABI, search
        `class$' and have it mangled with `mangle_decl.'
        * mangle.c (write_java_integer_type_codes): New function.
        (write_builtin_type): Detect and mangle Java integer and real
        types.

(http://gcc.gnu.org/ml/gcc-patches/2001-01/msg00756.html)

From-SVN: r38875
This commit is contained in:
Alexandre Petit-Bianco 2001-01-10 19:20:52 +00:00 committed by Alexandre Petit-Bianco
parent 0adc3d8a92
commit 23d4e4cc4a
4 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/cp/ChangeLog
View File

@ -57,6 +57,15 @@
Set IDENTIFIER_CLASS_VALUE when replacing an existing binding.
Don't set TREE_VALUE on the class_shadowed list.
2001-01-07 Alexandre Petit-Bianco <apbianco@cygnus.com>
* decl2.c (acceptable_java_type): Allow references too.
* init.c (build_java_class_ref): When using the new ABI, search
`class$' and have it mangled with `mangle_decl.'
* mangle.c (write_java_integer_type_codes): New function.
(write_builtin_type): Detect and mangle Java integer and real
types.
2001-01-07 Mark Mitchell <mark@codesourcery.com>
* decl2.c (grokfield): Don't accept `asm' specifiers for

2
gcc/cp/decl2.c
View File

@ -1336,7 +1336,7 @@ acceptable_java_type (type)
{
if (TREE_CODE (type) == VOID_TYPE || TYPE_FOR_JAVA (type))
return 1;
if (TREE_CODE (type) == POINTER_TYPE)
if (TREE_CODE (type) == POINTER_TYPE || TREE_CODE (type) == REFERENCE_TYPE)
{
type = TREE_TYPE (type);
if (TREE_CODE (type) == RECORD_TYPE)

18
gcc/cp/init.c
View File

@ -2206,7 +2206,23 @@ build_java_class_ref (type)
fatal("call to Java constructor, while `jclass' undefined");
jclass_node = TREE_TYPE (jclass_node);
}
name = build_static_name (type, CL_suffix);
/* Mangle the class$ field, new and old ABI */
if (flag_new_abi)
{
tree field;
for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field))
if (DECL_NAME (field) == CL_suffix)
{
name = mangle_decl (field);
break;
}
if (!field)
fatal ("Can't find class$");
}
else
name = build_static_name (type, CL_suffix);
class_decl = IDENTIFIER_GLOBAL_VALUE (name);
if (class_decl == NULL_TREE)
{

39
gcc/cp/mangle.c
View File

@ -189,6 +189,10 @@ static inline void start_mangling PARAMS ((void));
static inline const char *finish_mangling PARAMS ((void));
static tree mangle_special_for_type PARAMS ((tree, const char *));
/* Foreign language functions. */
static void write_java_integer_type_codes PARAMS ((tree));
/* Append a single character to the end of the mangled
representation. */
#define write_char(CHAR) \
@ -1446,6 +1450,8 @@ write_builtin_type (type)
integer_type_nodes. */
if (type == wchar_type_node)
write_char ('w');
if (TYPE_FOR_JAVA (type))
write_java_integer_type_codes (type);
else
{
size_t itk;
@ -1473,9 +1479,11 @@ write_builtin_type (type)
break;
case REAL_TYPE:
if (type == float_type_node)
if (type == float_type_node
|| type == java_float_type_node)
write_char ('f');
else if (type == double_type_node)
else if (type == double_type_node
|| type == java_double_type_node)
write_char ('d');
else if (type == long_double_type_node)
write_char ('e');
@ -2280,3 +2288,30 @@ mangle_guard_variable (variable)
write_name (variable, /*ignore_local_scope=*/0);
return get_identifier (finish_mangling ());
}
/* Foreign language type mangling section. */
/* How to write the type codes for the integer Java type. */
static void
write_java_integer_type_codes (type)
tree type;
{
if (type == java_int_type_node)
write_char ('i');
else if (type == java_short_type_node)
write_char ('s');
else if (type == java_byte_type_node)
write_char ('c');
else if (type == java_char_type_node)
write_char ('w');
else if (type == java_long_type_node)
write_char ('x');
else if (type == java_boolean_type_node)
write_char ('b');
else
my_friendly_abort (20001207);
}