1.1 --- a/src/cpu/sparc/vm/disassembler_sparc.hpp Fri Mar 28 09:00:39 2008 -0700 1.2 +++ b/src/cpu/sparc/vm/disassembler_sparc.hpp Wed Apr 02 12:09:59 2008 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright 1997-1999 Sun Microsystems, Inc. All Rights Reserved. 1.6 + * Copyright 1997-2008 Sun Microsystems, Inc. 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,30 +22,11 @@ 1.11 * 1.12 */ 1.13 1.14 -// The disassembler prints out sparc code annotated 1.15 -// with Java specific information. 1.16 + static int pd_instruction_alignment() { 1.17 + return sizeof(int); 1.18 + } 1.19 1.20 -class Disassembler { 1.21 -#ifndef PRODUCT 1.22 - private: 1.23 - // points to the library. 1.24 - static void* _library; 1.25 - // points to the print_insn_sparc function. 1.26 - static dll_func _print_insn_sparc; 1.27 - // tries to load library and return whether it succedded. 1.28 - static bool load_library(); 1.29 - // decodes one instruction and return the start of the next instruction. 1.30 - static address decode_instruction(address start, DisassemblerEnv* env); 1.31 -#endif 1.32 - public: 1.33 - static void decode(CodeBlob *cb, outputStream* st = NULL) PRODUCT_RETURN; 1.34 - static void decode(nmethod* nm, outputStream* st = NULL) PRODUCT_RETURN; 1.35 - static void decode(u_char* begin, u_char* end, outputStream* st = NULL) PRODUCT_RETURN; 1.36 -}; 1.37 - 1.38 -//Reconciliation History 1.39 -// 1.9 98/04/29 10:45:51 disassembler_i486.hpp 1.40 -// 1.10 98/05/11 16:47:20 disassembler_i486.hpp 1.41 -// 1.12 99/06/22 16:37:37 disassembler_i486.hpp 1.42 -// 1.13 99/08/06 10:09:04 disassembler_i486.hpp 1.43 -//End 1.44 + static const char* pd_cpu_opts() { 1.45 + return (VM_Version::v9_instructions_work()? 1.46 + (VM_Version::v8_instructions_work()? "" : "v9only") : "v8only"); 1.47 + }