1.1 --- a/src/cpu/x86/vm/vmStructs_x86.hpp Thu Jan 10 17:38:20 2013 -0500
1.2 +++ b/src/cpu/x86/vm/vmStructs_x86.hpp Thu Jan 10 17:06:26 2013 -0800
1.3 @@ -29,7 +29,7 @@
1.4 // constants required by the Serviceability Agent. This file is
1.5 // referenced by vmStructs.cpp.
1.6
1.7 -#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
1.8 +#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field) \
1.9 \
1.10 /******************************/ \
1.11 /* JavaCallWrapper */ \
1.12 @@ -37,31 +37,14 @@
1.13 /******************************/ \
1.14 /* JavaFrameAnchor */ \
1.15 /******************************/ \
1.16 - volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*) \
1.17 - \
1.18 + volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
1.19
1.20 - /* NOTE that we do not use the last_entry() macro here; it is used */
1.21 - /* in vmStructs_<os>_<cpu>.hpp's VM_STRUCTS_OS_CPU macro (and must */
1.22 - /* be present there) */
1.23
1.24
1.25 -#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
1.26 +#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type)
1.27
1.28 - /* NOTE that we do not use the last_entry() macro here; it is used */
1.29 - /* in vmStructs_<os>_<cpu>.hpp's VM_TYPES_OS_CPU macro (and must */
1.30 - /* be present there) */
1.31 +#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
1.32
1.33 -
1.34 -#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
1.35 -
1.36 - /* NOTE that we do not use the last_entry() macro here; it is used */
1.37 - /* in vmStructs_<os>_<cpu>.hpp's VM_INT_CONSTANTS_OS_CPU macro (and must */
1.38 - /* be present there) */
1.39 -
1.40 -#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
1.41 -
1.42 - /* NOTE that we do not use the last_entry() macro here; it is used */
1.43 - /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must */
1.44 - /* be present there) */
1.45 +#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
1.46
1.47 #endif // CPU_X86_VM_VMSTRUCTS_X86_HPP
