* Removed all Id tags.

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

diff --git a/src/vm/jit/i386/disass.c b/src/vm/jit/i386/disass.c
index 635861613e7fc77ac3bb539e2ff9218f7ae1e465..1d39b72715c2d5d9606841dfc426a0d9a79191ac 100644 (file)
--- a/src/vm/jit/i386/disass.c
+++ b/src/vm/jit/i386/disass.c
@@ -1,10 +1,9 @@
-/* jit/i386/disass.c - wrapper functions for GNU binutils disassembler
+/* src/vm/jit/i386/disass.c - wrapper functions for GNU binutils disassembler
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   Institut f. Computersprachen, TU Wien
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Probst,
-   S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich,
-   J. Wenninger
+   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.
 
@@ -20,139 +19,74 @@
 
    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 665 2003-11-21 18:36:43Z jowenn $
-
 */
 
 
-#include <stdarg.h>
-#include <string.h>
-#include "disass.h"
-#include "dis-asm.h"
+#include "config.h"
 
+#include <assert.h>
+#include <dis-asm.h>
+#include <stdarg.h>
 
-char mylinebuf[512];
-int mylen;
+#include "vm/types.h"
 
+#include "vm/global.h"
+#include "vm/jit/disass.h"
 
-char *regs[] = {
-       "eax",
-       "ecx",
-       "edx",
-       "ebx",
-       "esp",
-       "ebp",
-       "esi",
-       "edi"
-};
 
+/* disassinstr *****************************************************************
 
-void myprintf(PTR p, const char *fmt, ...)
-{
-       va_list ap;
-       va_start(ap, fmt);
-       mylen += vsprintf(mylinebuf + mylen, fmt, ap);
-       va_end(ap);
-}
+   Outputs a disassembler listing of one machine code instruction on
+   'stdout'.
 
-int buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, unsigned int length, struct disassemble_info *info)
-{
-       if (length == 1)
-               *myaddr = *((u1 *) memaddr);
-       else
-               memcpy(myaddr, (void *) memaddr, length);
-       return 0;
-}
+   code: instructions machine code
 
+*******************************************************************************/
 
+u1 *disassinstr(u1 *code)
+{
+       s4 seqlen;
+       s4 i;
 
-/* function disassinstr ********************************************************
+       if (!disass_initialized) {
+               INIT_DISASSEMBLE_INFO(info, NULL, disass_printf);
 
-       outputs a disassembler listing of one machine code instruction on 'stdout'
-       c:   instructions machine code
-       pos: instructions address relative to method start
+               /* setting the struct members must be done after
+                  INIT_DISASSEMBLE_INFO */
 
-*******************************************************************************/
+               info.mach             = bfd_mach_i386_i386;
+               info.read_memory_func = &disass_buffer_read_memory;
 
-int disassinstr(u1 *code, int pos)
-{
-       static disassemble_info info;
-       static int dis_initialized;
-       int seqlen;
-       int i;
-
-       if (!dis_initialized) {
-               INIT_DISASSEMBLE_INFO(info, NULL, myprintf);
-               info.mach = bfd_mach_i386_i386;
-               dis_initialized = 1;
+               disass_initialized = 1;
        }
 
        printf("0x%08x:   ", (s4) code);
-       mylen = 0;
-       seqlen = print_insn_i386((bfd_vma) code, &info);
 
-       for (i = 0; i < seqlen; i++) {
-               printf("%02x ", *(code++));
+       disass_len = 0;
+
+       seqlen = print_insn_i386((bfd_vma) (ptrint) code, &info);
+
+       for (i = 0; i < seqlen; i++, code++) {
+               printf("%02x ", *code);
        }
 
        for (; i < 8; i++) {
                printf("   ");
        }
 
-       printf("   %s\n", mylinebuf);
-
-       return (seqlen - 1);
-}
+       printf("   %s\n", disass_buf);
 
-
-
-/* function disassemble ********************************************************
-
-       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, int len)
-{
-       int p;
-       int seqlen;
-       int i;
-       disassemble_info info;
-
-       INIT_DISASSEMBLE_INFO(info, NULL, myprintf);
-       info.mach = bfd_mach_i386_i386;
-
-       printf("  --- disassembler listing ---\n");
-       for (p = 0; p < len;) {
-               printf("0x%08x:   ", (s4) code);
-               mylen = 0;
-
-               seqlen = print_insn_i386((bfd_vma) code, &info);
-               p += seqlen;
-               /*              myprintf(NULL, "\n"); */
-
-               for (i = 0; i < seqlen; i++) {
-                       printf("%02x ", *(code++));
-               }
-
-               for (; i < 8; i++) {
-                       printf("   ");
-               }
-
-               printf("   %s\n", mylinebuf);
-       }
+       return code;
 }