Merged revisions 7797-7917 via svnmerge from

[cacao.git] / src / vm / jit / x86_64 / disass.c

diff --git a/src/vm/jit/x86_64/disass.c b/src/vm/jit/x86_64/disass.c
index 34e4c69d9c79331efdde3a2ca654717218d716da..bd391181c3cc31328595a56adf015fffa386eecd 100644 (file)
--- a/src/vm/jit/x86_64/disass.c
+++ b/src/vm/jit/x86_64/disass.c
@@ -1,9 +1,9 @@
-/* vm/jit/x86_64/disass.c - wrapper functions for GNU binutils disassembler
+/* src/vm/jit/x86_64/disass.c - wrapper functions for GNU binutils disassembler
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,137 +19,75 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Andreas  Krall
             Reinhard Grafl
 
    Changes: Christian Thalinger
 
-   $Id: disass.c 1955 2005-02-17 19:50:24Z twisti $
+   $Id: disass.c 6259 2006-12-28 20:50:14Z twisti $
 
 */
 
 
-#include <stdarg.h>
+#include "config.h"
 
-#include "mm/memory.h"
-#include "vm/jit/x86_64/dis-asm.h"
-#include "vm/jit/x86_64/types.h"
+#include <dis-asm.h>
+#include <stdio.h>
 
+#include "vm/types.h"
 
-char mylinebuf[512];
-int mylen;
+#include "vm/global.h"
+#include "vm/jit/disass.h"
 
 
-/* name table for 16 integer registers */
-char *regs[] = {
-       "rax",
-       "rcx",
-       "rdx",
-       "rbx",
-       "rsp",
-       "rbp",
-       "rsi",
-       "rdi",
-    "r8",
-    "r9",
-    "r10",
-    "r11",
-    "r12",
-    "r13",
-    "r14",
-    "r15"
-};
+/* disassinstr *****************************************************************
 
+   Outputs a disassembler listing of one machine code instruction on
+   `stdout'.
 
-void myprintf(PTR p, const char *fmt, ...)
-{
-       va_list ap;
-       va_start(ap, fmt);
-       mylen += vsprintf(mylinebuf + mylen, fmt, ap);
-       va_end(ap);
-}
-
-
-int buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, unsigned int length, struct disassemble_info *info)
-{
-       if (length == 1) {
-               *myaddr = *((u1 *) memaddr);
-
-       } else {
-               MCOPY(myaddr, (void *) memaddr, u1, length);
-       }
-
-       return 0;
-}
-
-
-/* function disassinstr ********************************************************
-
-       outputs a disassembler listing of one machine code instruction on 'stdout'
-       c:   instructions machine code
-       pos: instructions address relative to method start
+   code: pointer to machine code
 
 *******************************************************************************/
 
-int disassinstr(u1 *code)
+u1 *disassinstr(u1 *code)
 {
-       static disassemble_info info;
-       static int dis_initialized;
        s4 seqlen;
        s4 i;
 
-       if (!dis_initialized) {
-               INIT_DISASSEMBLE_INFO(info, NULL, myprintf);
-               info.mach = bfd_mach_x86_64;
-               dis_initialized = 1;
+       if (!disass_initialized) {
+               INIT_DISASSEMBLE_INFO(info, NULL, disass_printf);
+
+               /* setting the struct members must be done after
+                  INIT_DISASSEMBLE_INFO */
+
+               info.mach             = bfd_mach_x86_64;
+               info.read_memory_func = &disass_buffer_read_memory;
+
+               disass_initialized = true;
        }
 
        printf("0x%016lx:   ", (s8) code);
-       mylen = 0;
+
+       disass_len = 0;
+
        seqlen = print_insn_i386((bfd_vma) code, &info);
 
-       for (i = 0; i < seqlen; i++) {
-               printf("%02x ", *(code++));
+       for (i = 0; i < seqlen; i++, code++) {
+               printf("%02x ", *code);
        }
        
        for (; i < 10; i++) {
                printf("   ");
        }
 
-       printf("   %s\n", mylinebuf);
-
-       return seqlen;
-}
-
-
-/* function disassemble ********************************************************
+       printf("   %s\n", disass_buf);
 
-       outputs a disassembler listing of some machine code on 'stdout'
-       code: pointer to first instruction
-       len:  code size (number of instructions * 4)
-
-*******************************************************************************/
-
-void disassemble(u1 *code, s4 len)
-{
-       s4 i;
-       s4 seqlen;
-       disassemble_info info;
-
-       INIT_DISASSEMBLE_INFO(info, NULL, myprintf);
-       info.mach = bfd_mach_x86_64;
-
-       printf("  --- disassembler listing ---\n");
-       for (i = 0; i < len; ) {
-               seqlen = disassinstr(code);
-               i += seqlen;
-               code += seqlen;
-       }
+       return code;
 }