--- a/src/hotspot/cpu/sparc/interp_masm_sparc.hpp Wed Mar 28 09:16:07 2018 +0200
+++ b/src/hotspot/cpu/sparc/interp_masm_sparc.hpp Wed Mar 28 09:21:05 2018 +0200
@@ -41,17 +41,6 @@
REGISTER_DECLARATION(FloatRegister, Ftos_d1, F0); // for 1st part of double
REGISTER_DECLARATION(FloatRegister, Ftos_d2, F1); // for 2nd part of double
-#ifndef DONT_USE_REGISTER_DEFINES
-#define Otos_i O0
-#define Otos_l O0
-#define Otos_l1 O0
-#define Otos_l2 O1
-#define Ftos_f F0
-#define Ftos_d F0
-#define Ftos_d1 F0
-#define Ftos_d2 F1
-#endif // DONT_USE_REGISTER_DEFINES
-
class InterpreterMacroAssembler: public MacroAssembler {
protected:
// Interpreter specific version of call_VM_base
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp Wed Mar 28 09:16:07 2018 +0200
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp Wed Mar 28 09:21:05 2018 +0200
@@ -199,41 +199,6 @@
REGISTER_DECLARATION(Register, Oexception , O0); // exception being thrown
REGISTER_DECLARATION(Register, Oissuing_pc , O1); // where the exception is coming from
-
-// These must occur after the declarations above
-#ifndef DONT_USE_REGISTER_DEFINES
-
-#define Gthread AS_REGISTER(Register, Gthread)
-#define Gmethod AS_REGISTER(Register, Gmethod)
-#define Gmegamorphic_method AS_REGISTER(Register, Gmegamorphic_method)
-#define Ginline_cache_reg AS_REGISTER(Register, Ginline_cache_reg)
-#define Gargs AS_REGISTER(Register, Gargs)
-#define Lthread_cache AS_REGISTER(Register, Lthread_cache)
-#define Gframe_size AS_REGISTER(Register, Gframe_size)
-#define Gtemp AS_REGISTER(Register, Gtemp)
-
-#define Lesp AS_REGISTER(Register, Lesp)
-#define Lbcp AS_REGISTER(Register, Lbcp)
-#define Lmethod AS_REGISTER(Register, Lmethod)
-#define Llocals AS_REGISTER(Register, Llocals)
-#define Lmonitors AS_REGISTER(Register, Lmonitors)
-#define Lbyte_code AS_REGISTER(Register, Lbyte_code)
-#define Lscratch AS_REGISTER(Register, Lscratch)
-#define Lscratch2 AS_REGISTER(Register, Lscratch2)
-#define LcpoolCache AS_REGISTER(Register, LcpoolCache)
-
-#define Lentry_args AS_REGISTER(Register, Lentry_args)
-#define I5_savedSP AS_REGISTER(Register, I5_savedSP)
-#define O5_savedSP AS_REGISTER(Register, O5_savedSP)
-#define IdispatchAddress AS_REGISTER(Register, IdispatchAddress)
-#define ImethodDataPtr AS_REGISTER(Register, ImethodDataPtr)
-
-#define Oexception AS_REGISTER(Register, Oexception)
-#define Oissuing_pc AS_REGISTER(Register, Oissuing_pc)
-
-#endif
-
-
// Address is an abstraction used to represent a memory location.
//
// Note: A register location is represented via a Register, not
--- a/src/hotspot/cpu/sparc/register_definitions_sparc.cpp Wed Mar 28 09:16:07 2018 +0200
+++ b/src/hotspot/cpu/sparc/register_definitions_sparc.cpp Wed Mar 28 09:21:05 2018 +0200
@@ -22,9 +22,6 @@
*
*/
-// make sure the defines don't screw up the declarations later on in this file
-#define DONT_USE_REGISTER_DEFINES
-
// Note: precompiled headers can not be used in this file because of the above
// definition
--- a/src/hotspot/cpu/sparc/register_sparc.hpp Wed Mar 28 09:16:07 2018 +0200
+++ b/src/hotspot/cpu/sparc/register_sparc.hpp Wed Mar 28 09:21:05 2018 +0200
@@ -154,62 +154,6 @@
CONSTANT_REGISTER_DECLARATION(Register, FP , (RegisterImpl::ibase + 6));
CONSTANT_REGISTER_DECLARATION(Register, SP , (RegisterImpl::obase + 6));
-//
-// Because sparc has so many registers, #define'ing values for the is
-// beneficial in code size and the cost of some of the dangers of
-// defines. We don't use them on Intel because win32 uses asm
-// directives which use the same names for registers as Hotspot does,
-// so #defines would screw up the inline assembly. If a particular
-// file has a problem with these defines then it's possible to turn
-// them off in that file by defining DONT_USE_REGISTER_DEFINES.
-// register_definition_sparc.cpp does that so that it's able to
-// provide real definitions of these registers for use in debuggers
-// and such.
-//
-
-#ifndef DONT_USE_REGISTER_DEFINES
-#define noreg ((Register)(noreg_RegisterEnumValue))
-
-#define G0 ((Register)(G0_RegisterEnumValue))
-#define G1 ((Register)(G1_RegisterEnumValue))
-#define G2 ((Register)(G2_RegisterEnumValue))
-#define G3 ((Register)(G3_RegisterEnumValue))
-#define G4 ((Register)(G4_RegisterEnumValue))
-#define G5 ((Register)(G5_RegisterEnumValue))
-#define G6 ((Register)(G6_RegisterEnumValue))
-#define G7 ((Register)(G7_RegisterEnumValue))
-
-#define O0 ((Register)(O0_RegisterEnumValue))
-#define O1 ((Register)(O1_RegisterEnumValue))
-#define O2 ((Register)(O2_RegisterEnumValue))
-#define O3 ((Register)(O3_RegisterEnumValue))
-#define O4 ((Register)(O4_RegisterEnumValue))
-#define O5 ((Register)(O5_RegisterEnumValue))
-#define O6 ((Register)(O6_RegisterEnumValue))
-#define O7 ((Register)(O7_RegisterEnumValue))
-
-#define L0 ((Register)(L0_RegisterEnumValue))
-#define L1 ((Register)(L1_RegisterEnumValue))
-#define L2 ((Register)(L2_RegisterEnumValue))
-#define L3 ((Register)(L3_RegisterEnumValue))
-#define L4 ((Register)(L4_RegisterEnumValue))
-#define L5 ((Register)(L5_RegisterEnumValue))
-#define L6 ((Register)(L6_RegisterEnumValue))
-#define L7 ((Register)(L7_RegisterEnumValue))
-
-#define I0 ((Register)(I0_RegisterEnumValue))
-#define I1 ((Register)(I1_RegisterEnumValue))
-#define I2 ((Register)(I2_RegisterEnumValue))
-#define I3 ((Register)(I3_RegisterEnumValue))
-#define I4 ((Register)(I4_RegisterEnumValue))
-#define I5 ((Register)(I5_RegisterEnumValue))
-#define I6 ((Register)(I6_RegisterEnumValue))
-#define I7 ((Register)(I7_RegisterEnumValue))
-
-#define FP ((Register)(FP_RegisterEnumValue))
-#define SP ((Register)(SP_RegisterEnumValue))
-#endif // DONT_USE_REGISTER_DEFINES
-
// Use FloatRegister as shortcut
class FloatRegisterImpl;
typedef FloatRegisterImpl* FloatRegister;
@@ -321,59 +265,6 @@
CONSTANT_REGISTER_DECLARATION(FloatRegister, F60 , (60));
CONSTANT_REGISTER_DECLARATION(FloatRegister, F62 , (62));
-
-#ifndef DONT_USE_REGISTER_DEFINES
-#define fnoreg ((FloatRegister)(fnoreg_FloatRegisterEnumValue))
-#define F0 ((FloatRegister)( F0_FloatRegisterEnumValue))
-#define F1 ((FloatRegister)( F1_FloatRegisterEnumValue))
-#define F2 ((FloatRegister)( F2_FloatRegisterEnumValue))
-#define F3 ((FloatRegister)( F3_FloatRegisterEnumValue))
-#define F4 ((FloatRegister)( F4_FloatRegisterEnumValue))
-#define F5 ((FloatRegister)( F5_FloatRegisterEnumValue))
-#define F6 ((FloatRegister)( F6_FloatRegisterEnumValue))
-#define F7 ((FloatRegister)( F7_FloatRegisterEnumValue))
-#define F8 ((FloatRegister)( F8_FloatRegisterEnumValue))
-#define F9 ((FloatRegister)( F9_FloatRegisterEnumValue))
-#define F10 ((FloatRegister)( F10_FloatRegisterEnumValue))
-#define F11 ((FloatRegister)( F11_FloatRegisterEnumValue))
-#define F12 ((FloatRegister)( F12_FloatRegisterEnumValue))
-#define F13 ((FloatRegister)( F13_FloatRegisterEnumValue))
-#define F14 ((FloatRegister)( F14_FloatRegisterEnumValue))
-#define F15 ((FloatRegister)( F15_FloatRegisterEnumValue))
-#define F16 ((FloatRegister)( F16_FloatRegisterEnumValue))
-#define F17 ((FloatRegister)( F17_FloatRegisterEnumValue))
-#define F18 ((FloatRegister)( F18_FloatRegisterEnumValue))
-#define F19 ((FloatRegister)( F19_FloatRegisterEnumValue))
-#define F20 ((FloatRegister)( F20_FloatRegisterEnumValue))
-#define F21 ((FloatRegister)( F21_FloatRegisterEnumValue))
-#define F22 ((FloatRegister)( F22_FloatRegisterEnumValue))
-#define F23 ((FloatRegister)( F23_FloatRegisterEnumValue))
-#define F24 ((FloatRegister)( F24_FloatRegisterEnumValue))
-#define F25 ((FloatRegister)( F25_FloatRegisterEnumValue))
-#define F26 ((FloatRegister)( F26_FloatRegisterEnumValue))
-#define F27 ((FloatRegister)( F27_FloatRegisterEnumValue))
-#define F28 ((FloatRegister)( F28_FloatRegisterEnumValue))
-#define F29 ((FloatRegister)( F29_FloatRegisterEnumValue))
-#define F30 ((FloatRegister)( F30_FloatRegisterEnumValue))
-#define F31 ((FloatRegister)( F31_FloatRegisterEnumValue))
-#define F32 ((FloatRegister)( F32_FloatRegisterEnumValue))
-#define F34 ((FloatRegister)( F34_FloatRegisterEnumValue))
-#define F36 ((FloatRegister)( F36_FloatRegisterEnumValue))
-#define F38 ((FloatRegister)( F38_FloatRegisterEnumValue))
-#define F40 ((FloatRegister)( F40_FloatRegisterEnumValue))
-#define F42 ((FloatRegister)( F42_FloatRegisterEnumValue))
-#define F44 ((FloatRegister)( F44_FloatRegisterEnumValue))
-#define F46 ((FloatRegister)( F46_FloatRegisterEnumValue))
-#define F48 ((FloatRegister)( F48_FloatRegisterEnumValue))
-#define F50 ((FloatRegister)( F50_FloatRegisterEnumValue))
-#define F52 ((FloatRegister)( F52_FloatRegisterEnumValue))
-#define F54 ((FloatRegister)( F54_FloatRegisterEnumValue))
-#define F56 ((FloatRegister)( F56_FloatRegisterEnumValue))
-#define F58 ((FloatRegister)( F58_FloatRegisterEnumValue))
-#define F60 ((FloatRegister)( F60_FloatRegisterEnumValue))
-#define F62 ((FloatRegister)( F62_FloatRegisterEnumValue))
-#endif // DONT_USE_REGISTER_DEFINES
-
// Maximum number of incoming arguments that can be passed in i registers.
const int SPARC_ARGS_IN_REGS_NUM = 6;