Mercurial > hg > truffle
annotate src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp @ 17833:bfdf528be8e8
8038498: Fix includes and C inlining after 8035330
Summary: Change 8035330: Remove G1ParScanPartialArrayClosure and G1ParScanHeapEvacClosure broke the debug build on AIX. The method do_oop_partial_array() is added in a header, but requires the inline function par_write_ref() through several inlined calls. In some cpp files, like arguments.cpp, par_write_ref() is not defined as the corresponding inline header and is not included. The AIX debug VM does not start because of the missing symbol. This change solves this by cleaning up include dependencies.
Reviewed-by: tschatzl, stefank
author | tschatzl |
---|---|
date | Fri, 04 Apr 2014 10:43:56 +0200 |
parents | 33c52908bcdb |
children |
rev | line source |
---|---|
0 | 1 /* |
11144
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
2 * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
844
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
844
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
844
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
1972 | 25 #ifndef OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP |
26 #define OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP | |
27 | |
0 | 28 |
29 #ifdef AMD64 | |
30 typedef unsigned char UBYTE; | |
31 | |
11144
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
32 #if _MSC_VER < 1700 |
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
33 |
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
34 /* Not needed for VS2012 compiler, comes from winnt.h. */ |
0 | 35 #define UNW_FLAG_EHANDLER 0x01 |
36 #define UNW_FLAG_UHANDLER 0x02 | |
37 #define UNW_FLAG_CHAININFO 0x04 | |
38 | |
11144
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
39 #endif |
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
40 |
0 | 41 // This structure is used to define an UNWIND_INFO that |
42 // only has an ExceptionHandler. There are no UnwindCodes | |
43 // declared. | |
44 typedef struct _UNWIND_INFO_EH_ONLY { | |
45 UBYTE Version : 3; | |
46 UBYTE Flags : 5; | |
47 UBYTE SizeOfProlog; | |
48 UBYTE CountOfCodes; | |
49 UBYTE FrameRegister : 4; | |
50 UBYTE FrameOffset : 4; | |
51 union { | |
52 OPTIONAL ULONG ExceptionHandler; | |
53 OPTIONAL ULONG FunctionEntry; | |
54 }; | |
55 OPTIONAL ULONG ExceptionData[1]; | |
56 } UNWIND_INFO_EH_ONLY, *PUNWIND_INFO_EH_ONLY; | |
57 | |
58 | |
59 /* | |
60 typedef struct _RUNTIME_FUNCTION { | |
61 ULONG BeginAddress; | |
62 ULONG EndAddress; | |
63 ULONG UnwindData; | |
64 } RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; | |
65 */ | |
66 | |
11144
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
67 #if _MSC_VER < 1700 |
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
68 |
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
69 /* Not needed for VS2012 compiler, comes from winnt.h. */ |
0 | 70 typedef struct _DISPATCHER_CONTEXT { |
71 ULONG64 ControlPc; | |
72 ULONG64 ImageBase; | |
73 PRUNTIME_FUNCTION FunctionEntry; | |
74 ULONG64 EstablisherFrame; | |
75 ULONG64 TargetIp; | |
76 PCONTEXT ContextRecord; | |
77 // PEXCEPTION_ROUTINE LanguageHandler; | |
78 char * LanguageHandler; // double dependency problem | |
79 PVOID HandlerData; | |
80 } DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; | |
81 | |
11144
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
82 #endif |
33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
dholmes
parents:
2233
diff
changeset
|
83 |
2233
15d6977f04b0
7017824: Add support for creating 64-bit Visual Studio projects
sla
parents:
1972
diff
changeset
|
84 #if _MSC_VER < 1500 |
645
c3a720eefe82
6816308: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
kvn
parents:
0
diff
changeset
|
85 |
c3a720eefe82
6816308: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
kvn
parents:
0
diff
changeset
|
86 /* Not needed for VS2008 compiler, comes from winnt.h. */ |
0 | 87 typedef EXCEPTION_DISPOSITION (*PEXCEPTION_ROUTINE) ( |
88 IN PEXCEPTION_RECORD ExceptionRecord, | |
89 IN ULONG64 EstablisherFrame, | |
90 IN OUT PCONTEXT ContextRecord, | |
91 IN OUT PDISPATCHER_CONTEXT DispatcherContext | |
92 ); | |
93 | |
645
c3a720eefe82
6816308: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
kvn
parents:
0
diff
changeset
|
94 #endif |
c3a720eefe82
6816308: Changes to allow builds with latest Windows SDK 6.1 on 64bit Windows 2003
kvn
parents:
0
diff
changeset
|
95 |
0 | 96 #endif // AMD64 |
1972 | 97 |
98 #endif // OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP |