comparison src/cpu/sparc/vm/vmStructs_sparc.hpp @ 7583:91bf7da5c609

8004747: Remove last_entry from VM_STRUCT macros Summary: Instead of passing in last_entry to all the VM_ macros just expand it in the main vmStructs.cpp file. Reviewed-by: dholmes, sspitsyn, minqi
author mikael
date Thu, 10 Jan 2013 17:06:26 -0800
parents f95d63e2154a
children de6a9e811145
comparison
equal deleted inserted replaced
7582:aefb345d3f5e 7583:91bf7da5c609
27 27
28 // These are the CPU-specific fields, types and integer 28 // These are the CPU-specific fields, types and integer
29 // constants required by the Serviceability Agent. This file is 29 // constants required by the Serviceability Agent. This file is
30 // referenced by vmStructs.cpp. 30 // referenced by vmStructs.cpp.
31 31
32 #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) \ 32 #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) \
33 \ 33 \
34 /******************************/ \ 34 /******************************/ \
35 /* JavaCallWrapper */ \ 35 /* JavaCallWrapper */ \
36 /******************************/ \ 36 /******************************/ \
37 /******************************/ \ 37 /******************************/ \
38 /* JavaFrameAnchor */ \ 38 /* JavaFrameAnchor */ \
39 /******************************/ \ 39 /******************************/ \
40 volatile_nonstatic_field(JavaFrameAnchor, _flags, int) \ 40 volatile_nonstatic_field(JavaFrameAnchor, _flags, int)
41 \
42 41
43 /* NOTE that we do not use the last_entry() macro here; it is used */ 42 #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)
44 /* in vmStructs_<os>_<cpu>.hpp's VM_STRUCTS_OS_CPU macro (and must */
45 /* be present there) */
46 43
47 44
48 #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) \ 45 #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) \
49
50 /* NOTE that we do not use the last_entry() macro here; it is used */
51 /* in vmStructs_<os>_<cpu>.hpp's VM_TYPES_OS_CPU macro (and must */
52 /* be present there) */
53
54
55 #define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
56 /******************************/ \ 46 /******************************/ \
57 /* Register numbers (C2 only) */ \ 47 /* Register numbers (C2 only) */ \
58 /******************************/ \ 48 /******************************/ \
59 \ 49 \
60 declare_c2_constant(R_L0_num) \ 50 declare_c2_constant(R_L0_num) \
88 declare_c2_constant(R_G4_num) \ 78 declare_c2_constant(R_G4_num) \
89 declare_c2_constant(R_G5_num) \ 79 declare_c2_constant(R_G5_num) \
90 declare_c2_constant(R_G6_num) \ 80 declare_c2_constant(R_G6_num) \
91 declare_c2_constant(R_G7_num) 81 declare_c2_constant(R_G7_num)
92 82
93 83 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
94 /* NOTE that we do not use the last_entry() macro here; it is used */
95 /* in vmStructs_<os>_<cpu>.hpp's VM_INT_CONSTANTS_OS_CPU macro (and must */
96 /* be present there) */
97
98 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
99
100 /* NOTE that we do not use the last_entry() macro here; it is used */
101 /* in vmStructs_<os>_<cpu>.hpp's VM_LONG_CONSTANTS_OS_CPU macro (and must */
102 /* be present there) */
103 84
104 #endif // CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP 85 #endif // CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP