1.1 --- a/src/cpu/zero/vm/vmStructs_zero.hpp Thu Jan 10 17:38:20 2013 -0500 1.2 +++ b/src/cpu/zero/vm/vmStructs_zero.hpp Thu Jan 10 17:06:26 2013 -0800 1.3 @@ -30,28 +30,12 @@ 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 - /* NOTE that we do not use the last_entry() macro here; it is used */ 1.11 - /* in vmStructs_<os>_<cpu>.hpp's VM_STRUCTS_OS_CPU macro (and must */ 1.12 - /* be present there) */ 1.13 +#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.14 1.15 -#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.16 +#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) 1.17 1.18 - /* NOTE that we do not use the last_entry() macro here; it is used */ 1.19 - /* in vmStructs_<os>_<cpu>.hpp's VM_TYPES_OS_CPU macro (and must */ 1.20 - /* be present there) */ 1.21 - 1.22 -#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \ 1.23 - 1.24 - /* NOTE that we do not use the last_entry() macro here; it is used */ 1.25 - /* in vmStructs_<os>_<cpu>.hpp's VM_INT_CONSTANTS_OS_CPU macro (and must */ 1.26 - /* be present there) */ 1.27 - 1.28 -#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \ 1.29 - 1.30 - /* NOTE that we do not use the last_entry() macro here; it is used */ 1.31 - /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must */ 1.32 - /* be present there) */ 1.33 +#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) 1.34 1.35 #endif // CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP