src/share/vm/adlc/adlc.hpp
Print this page
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
@@ -20,10 +20,13 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
+#ifndef SHARE_VM_ADLC_ADLC_HPP
+#define SHARE_VM_ADLC_ADLC_HPP
+
//
// Standard include file for ADLC parser
//
// standard library constants
@@ -75,22 +78,23 @@
// Macros
#define uint32 unsigned int
#define uint unsigned int
+// VM components
+#include "opto/opcodes.hpp"
+
// Macros
// Debugging note: Put a breakpoint on "abort".
#undef assert
#define assert(cond, msg) { if (!(cond)) { fprintf(stderr, "assert fails %s %d: %s\n", __FILE__, __LINE__, msg); abort(); }}
+#undef max
#define max(a, b) (((a)>(b)) ? (a) : (b))
-// VM components
-#include "opcodes.hpp"
-
// ADLC components
#include "arena.hpp"
-#include "adlcVMDeps.hpp"
+#include "opto/adlcVMDeps.hpp"
#include "filebuff.hpp"
#include "dict2.hpp"
#include "forms.hpp"
#include "formsopt.hpp"
#include "formssel.hpp"
@@ -99,5 +103,7 @@
// globally define ArchDesc for convenience. Alternatively every form
// could have a backpointer to the AD but it's too complicated to pass
// it everywhere it needs to be available.
extern ArchDesc* globalAD;
+
+#endif // SHARE_VM_ADLC_ADLC_HPP