comparison src/os_cpu/windows_x86/vm/vmStructs_windows_x86.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 df84b4a3ebcb
children de6a9e811145
comparison
equal deleted inserted replaced
7582:aefb345d3f5e 7583:91bf7da5c609
27 27
28 // These are the OS and CPU-specific fields, types and integer 28 // These are the OS and 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_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) \ 32 #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) \
33 \ 33 \
34 /******************************/ \ 34 /******************************/ \
35 /* Threads (NOTE: incomplete) */ \ 35 /* Threads (NOTE: incomplete) */ \
36 /******************************/ \ 36 /******************************/ \
37 \ 37 \
38 nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \ 38 nonstatic_field(OSThread, _thread_id, OSThread::thread_id_t) \
39 unchecked_nonstatic_field(OSThread, _thread_handle, sizeof(HANDLE)) /* NOTE: no type */ \ 39 unchecked_nonstatic_field(OSThread, _thread_handle, sizeof(HANDLE)) /* NOTE: no type */
40 \
41 /* This must be the last entry, and must be present */ \
42 last_entry()
43 40
44 #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) \ 41 #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) \
45 \ 42 \
46 declare_unsigned_integer_type(OSThread::thread_id_t) \ 43 declare_unsigned_integer_type(OSThread::thread_id_t)
47 /* This must be the last entry, and must be present */ \
48 last_entry()
49 44
50 #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \ 45 #define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
51 \
52 /* This must be the last entry, and must be present */ \
53 last_entry()
54 46
55 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \ 47 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
56 \
57 /* This must be the last entry, and must be present */ \
58 last_entry()
59 48
60 #endif // OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP 49 #endif // OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP