comparison src/share/vm/ci/ciUtilities.hpp @ 6988:2cb439954abf

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 19 Nov 2012 15:36:13 +0100
parents 22d11b3bc561 bd7a7ce2e264
children ce248dc0a656
comparison
equal deleted inserted replaced
6963:dd0dd0321e2a 6988:2cb439954abf
1 /* 1 /*
2 * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 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 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
78 assert(IS_IN_VM, "must be in vm state"); 78 assert(IS_IN_VM, "must be in vm state");
79 79
80 #define GUARDED_VM_ENTRY(action) \ 80 #define GUARDED_VM_ENTRY(action) \
81 {if (IS_IN_VM) { action } else { VM_ENTRY_MARK; { action }}} 81 {if (IS_IN_VM) { action } else { VM_ENTRY_MARK; { action }}}
82 82
83 #define GUARDED_VM_QUICK_ENTRY(action) \
84 {if (IS_IN_VM) { action } else { VM_QUICK_ENTRY_MARK; { action }}}
85
83 // Redefine this later. 86 // Redefine this later.
84 #define KILL_COMPILE_ON_FATAL_(result) \ 87 #define KILL_COMPILE_ON_FATAL_(result) \
85 THREAD); \ 88 THREAD); \
86 if (HAS_PENDING_EXCEPTION) { \ 89 if (HAS_PENDING_EXCEPTION) { \
87 if (PENDING_EXCEPTION->klass() == \ 90 if (PENDING_EXCEPTION->klass() == \