1.1 --- a/src/share/vm/compiler/disassembler.hpp Tue Nov 23 15:01:43 2010 -0500 1.2 +++ b/src/share/vm/compiler/disassembler.hpp Tue Nov 23 13:22:55 2010 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -22,6 +22,20 @@ 1.11 * 1.12 */ 1.13 1.14 +#ifndef SHARE_VM_COMPILER_DISASSEMBLER_HPP 1.15 +#define SHARE_VM_COMPILER_DISASSEMBLER_HPP 1.16 + 1.17 +#include "runtime/globals.hpp" 1.18 +#ifdef TARGET_OS_FAMILY_linux 1.19 +# include "os_linux.inline.hpp" 1.20 +#endif 1.21 +#ifdef TARGET_OS_FAMILY_solaris 1.22 +# include "os_solaris.inline.hpp" 1.23 +#endif 1.24 +#ifdef TARGET_OS_FAMILY_windows 1.25 +# include "os_windows.inline.hpp" 1.26 +#endif 1.27 + 1.28 class decode_env; 1.29 1.30 // The disassembler prints out assembly code annotated 1.31 @@ -47,7 +61,16 @@ 1.32 static bool load_library(); 1.33 1.34 // Machine dependent stuff 1.35 - #include "incls/_disassembler_pd.hpp.incl" 1.36 +#ifdef TARGET_ARCH_x86 1.37 +# include "disassembler_x86.hpp" 1.38 +#endif 1.39 +#ifdef TARGET_ARCH_sparc 1.40 +# include "disassembler_sparc.hpp" 1.41 +#endif 1.42 +#ifdef TARGET_ARCH_zero 1.43 +# include "disassembler_zero.hpp" 1.44 +#endif 1.45 + 1.46 1.47 public: 1.48 static bool can_decode() { 1.49 @@ -57,3 +80,5 @@ 1.50 static void decode(nmethod* nm, outputStream* st = NULL); 1.51 static void decode(address begin, address end, outputStream* st = NULL); 1.52 }; 1.53 + 1.54 +#endif // SHARE_VM_COMPILER_DISASSEMBLER_HPP