From e7a4277263e6eeb7c934e2d687a248e00d7f7367 Mon Sep 17 00:00:00 2001 From: Jan Brittenson Date: Thu, 23 Sep 1993 10:08:13 -0700 Subject: [PATCH] changed bytecode rtx structure references into macros From-SVN: r5435 --- gcc/expr.c | 23 ++++++++++++++--------- gcc/function.c | 7 ++++--- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gcc/expr.c b/gcc/expr.c index 87dc0ad..b250122 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -5738,13 +5738,14 @@ bc_expand_expr (exp) abort (); #if 0 - if (DECL_RTL (exp)->label) + if (BYTECODE_LABEL (DECL_RTL (exp))) bc_load_externaddr (DECL_RTL (exp)); else bc_load_localaddr (DECL_RTL (exp)); #endif if (TREE_PUBLIC (exp)) - bc_load_externaddr_id (DECL_ASSEMBLER_NAME (exp), DECL_RTL (exp)->offset); + bc_load_externaddr_id (DECL_ASSEMBLER_NAME (exp), + BYTECODE_BC_LABEL (DECL_RTL (exp))->offset); else bc_load_localaddr (DECL_RTL (exp)); @@ -9103,7 +9104,8 @@ bc_load_externaddr (externaddr) rtx externaddr; { bc_emit_bytecode (constP); - bc_emit_code_labelref (externaddr->label, externaddr->offset); + bc_emit_code_labelref (BYTECODE_LABEL (externaddr), + BYTECODE_BC_LABEL (externaddr)->offset); #ifdef DEBUG_PRINT_CODE fputc ('\n', stderr); @@ -9144,7 +9146,7 @@ void bc_load_localaddr (localaddr) rtx localaddr; { - bc_emit_instruction (localP, (HOST_WIDE_INT) localaddr->offset); + bc_emit_instruction (localP, (HOST_WIDE_INT) BYTECODE_BC_LABEL (localaddr)->offset); } @@ -9154,7 +9156,8 @@ void bc_load_parmaddr (parmaddr) rtx parmaddr; { - bc_emit_instruction (argP, (HOST_WIDE_INT) parmaddr->offset / BITS_PER_UNIT); + bc_emit_instruction (argP, ((HOST_WIDE_INT) BYTECODE_BC_LABEL (parmaddr)->offset + / BITS_PER_UNIT)); } @@ -9301,7 +9304,8 @@ bc_expand_address (exp) case FUNCTION_DECL: - bc_load_externaddr_id (DECL_ASSEMBLER_NAME (exp), DECL_RTL (exp)->offset); + bc_load_externaddr_id (DECL_ASSEMBLER_NAME (exp), + BYTECODE_BC_LABEL (DECL_RTL (exp))->offset); break; case PARM_DECL: @@ -9328,12 +9332,13 @@ bc_expand_address (exp) case VAR_DECL: #if 0 - if (DECL_RTL (exp)->label) + if (BYTECODE_LABEL (DECL_RTL (exp))) bc_load_externaddr (DECL_RTL (exp)); #endif if (DECL_EXTERNAL (exp)) - bc_load_externaddr_id (DECL_ASSEMBLER_NAME (exp), DECL_RTL (exp)->offset); + bc_load_externaddr_id (DECL_ASSEMBLER_NAME (exp), + BYTECODE_BC_OFFSET (DECL_RTL (exp))); else bc_load_localaddr (DECL_RTL (exp)); @@ -9355,7 +9360,7 @@ bc_expand_address (exp) bc_emit_bytecode (constP); r = output_constant_def (exp); - bc_emit_code_labelref (r->label, r->offset); + bc_emit_code_labelref (BYTECODE_LABEL (r), BYTECODE_BC_LABEL (r)->offset); #ifdef DEBUG_PRINT_CODE fputc ('\n', stderr); diff --git a/gcc/function.c b/gcc/function.c index 9853073..1a3a375 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -4590,7 +4590,8 @@ bc_expand_function_start (subr, parms_have_cleanups) ++nlab; name = (char *) obstack_copy0 (&permanent_obstack, label, strlen (label)); this_function_callinfo = bc_gen_rtx (name, 0, (struct bc_label *) 0); - this_function_bytecode = bc_emit_trampoline (this_function_callinfo->label); + this_function_bytecode = + bc_emit_trampoline (BYTECODE_LABEL (this_function_callinfo)); } @@ -4616,12 +4617,12 @@ bc_expand_function_end () /* If this changes also make sure to change bc-interp.h! */ - bc_emit_const_labeldef (this_function_callinfo->label); + bc_emit_const_labeldef (BYTECODE_LABEL (this_function_callinfo)); bc_emit_const ((char *) &max_stack_depth, sizeof max_stack_depth); bc_emit_const ((char *) &local_vars_size, sizeof local_vars_size); bc_emit_const_labelref (this_function_bytecode, 0); bc_emit_const_labelref (ptrconsts, 0); - bc_emit_const_labelref (this_function_calldesc->label, 0); + bc_emit_const_labelref (BYTECODE_LABEL (this_function_calldesc), 0); } -- 2.7.4