1.1 --- a/src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp Thu Jan 10 17:38:20 2013 -0500 1.2 +++ b/src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp Thu Jan 10 17:06:26 2013 -0800 1.3 @@ -29,36 +29,24 @@ 1.4 // constants required by the Serviceability Agent. This file is 1.5 // referenced by vmStructs.cpp. 1.6 1.7 -#define VM_STRUCTS_OS_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_OS_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 /* Threads (NOTE: incomplete) */ \ 1.12 /******************************/ \ 1.13 \ 1.14 - nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \ 1.15 - \ 1.16 - /* This must be the last entry, and must be present */ \ 1.17 - last_entry() 1.18 + nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) 1.19 1.20 -#define VM_TYPES_OS_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.21 +#define VM_TYPES_OS_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.22 \ 1.23 /**********************/ \ 1.24 /* Solaris Thread IDs */ \ 1.25 /**********************/ \ 1.26 \ 1.27 - declare_unsigned_integer_type(OSThread::thread_id_t) \ 1.28 - \ 1.29 - /* This must be the last entry, and must be present */ \ 1.30 - last_entry() 1.31 + declare_unsigned_integer_type(OSThread::thread_id_t) 1.32 1.33 -#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \ 1.34 - \ 1.35 - /* This must be the last entry, and must be present */ \ 1.36 - last_entry() 1.37 +#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) 1.38 1.39 -#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \ 1.40 - \ 1.41 - /* This must be the last entry, and must be present */ \ 1.42 - last_entry() 1.43 +#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant) 1.44 1.45 #endif // OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP