src/hotspot/cpu/s390/disassembler_s390.hpp

rev 54960 : 8213084: Rework and enhance Print[Opto]Assembly output
Reviewed-by: kvn, thartmann

@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2019 SAP SE. 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.

@@ -25,13 +25,38 @@
 
 #ifndef CPU_S390_DISASSEMBLER_S390_HPP
 #define CPU_S390_DISASSEMBLER_S390_HPP
 
   static int pd_instruction_alignment() {
-    return 1;
+    return 2;
   }
 
   static const char* pd_cpu_opts() {
-    return "zarch";
+    return "s390";
   }
 
+  static bool valid_opcodes[256];
+  static bool is_valid_opcode_at(address here);
+
+  // Find preceding instruction.
+  //
+  // Starting at the passed location, the n-th preceding (towards lower addresses)
+  // location is searched, the contents of which - if interpreted as
+  // instructions - has the passed location as n-th successor.
+  //  - If multiple such locations exist between (here-n*instr_maxlen()) and here,
+  //    the most distant location is selected.
+  //  - If no such location exists, NULL is returned. The caller should then
+  //    terminate its search and react properly.
+  static address find_prev_instr(address here, int n_instr);
+  static int     count_instr(address begin, address end);
+
+  // special-case instruction decoding.
+  // There may be cases where the binutils disassembler doesn't do
+  // the perfect job. In those cases, decode_instruction0 may kick in
+  // and do it right.
+  // If nothing had to be done, just return "here", otherwise return "here + instr_len(here)"
+  static address decode_instruction0(address here, outputStream* st, address virtual_begin = NULL);
+
+  // platform-specific instruction annotations (like value of loaded constants)
+  static void annotate(address pc, outputStream* st);
+
 #endif // CPU_S390_DISASSEMBLER_S390_HPP