1.1 --- a/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp Thu Jan 10 17:38:20 2013 -0500
1.2 +++ b/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp Thu Jan 10 17:06:26 2013 -0800
1.3 @@ -29,37 +29,26 @@
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 nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \
1.14 - nonstatic_field(OSThread, _pthread_id, pthread_t) \
1.15 - /* This must be the last entry, and must be present */ \
1.16 - last_entry()
1.17 + nonstatic_field(OSThread, _pthread_id, pthread_t)
1.18
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 /* Posix Thread IDs */ \
1.25 /**********************/ \
1.26 \
1.27 declare_unsigned_integer_type(OSThread::thread_id_t) \
1.28 - declare_unsigned_integer_type(pthread_t) \
1.29 - \
1.30 - /* This must be the last entry, and must be present */ \
1.31 - last_entry()
1.32 + declare_unsigned_integer_type(pthread_t)
1.33
1.34 -#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
1.35 - \
1.36 - /* This must be the last entry, and must be present */ \
1.37 - last_entry()
1.38 +#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
1.39
1.40 -#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
1.41 - \
1.42 - /* This must be the last entry, and must be present */ \
1.43 - last_entry()
1.44 +#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
1.45
1.46 #endif // OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
