projects
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdb/
[binutils-gdb.git]
/
gas
/
itbl-ops.c
diff --git
a/gas/itbl-ops.c
b/gas/itbl-ops.c
index 7c5c7495673bf285e4ba4915211fd07b734bf21e..9d6e8ffbbf53b3b8033f52e03434cbe97b8d7db5 100644
(file)
--- a/
gas/itbl-ops.c
+++ b/
gas/itbl-ops.c
@@
-1,12
+1,12
@@
/* itbl-ops.c
/* itbl-ops.c
- Copyright 1997, 1999, 2000, 2001, 2002, 2003, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright 1997, 1999, 2000, 2001, 2002, 2003, 2005, 2006
, 2007,
+
2009
Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
GAS is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This file is part of GAS, the GNU Assembler.
GAS is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2
, or (at your option)
+ the Free Software Foundation; either version
3
, or (at your option)
any later version.
GAS is distributed in the hope that it will be useful,
any later version.
GAS is distributed in the hope that it will be useful,
@@
-97,7
+97,7
@@
#ifdef DEBUG
#include <assert.h>
#ifdef DEBUG
#include <assert.h>
-#define ASSERT(x)
assert
(x)
+#define ASSERT(x)
gas_assert
(x)
#define DBG(x) printf x
#else
#define ASSERT(x)
#define DBG(x) printf x
#else
#define ASSERT(x)
@@
-145,12
+145,7
@@
struct itbl_entry {
static int itbl_num_opcodes = 0;
/* Array of entries for each processor and entry type */
static int itbl_num_opcodes = 0;
/* Array of entries for each processor and entry type */
-static struct itbl_entry *entries[e_nprocs][e_ntypes] = {
- {0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0},
- {0, 0, 0, 0, 0, 0}
-};
+static struct itbl_entry *entries[e_nprocs][e_ntypes];
/* local prototypes */
static unsigned long build_opcode (struct itbl_entry *e);
/* local prototypes */
static unsigned long build_opcode (struct itbl_entry *e);
@@
-598,6
+593,7
@@
itbl_disassemble (char *s, unsigned long insn)
{
struct itbl_entry *r;
unsigned long value;
{
struct itbl_entry *r;
unsigned long value;
+ char s_value[20];
if (f == e->fields) /* First operand is preceded by tab. */
strcat (s, "\t");
if (f == e->fields) /* First operand is preceded by tab. */
strcat (s, "\t");
@@
-616,14
+612,18
@@
itbl_disassemble (char *s, unsigned long insn)
if (r)
strcat (s, r->name);
else
if (r)
strcat (s, r->name);
else
- sprintf (s, "%s$%lu", s, value);
+ {
+ sprintf (s_value, "$%lu", value);
+ strcat (s, s_value);
+ }
break;
case e_addr:
/* Use assembler's symbol table to find symbol. */
/* FIXME!! Do we need this? If so, what about relocs?? */
/* If not a symbol, fall through to IMMED. */
case e_immed:
break;
case e_addr:
/* Use assembler's symbol table to find symbol. */
/* FIXME!! Do we need this? If so, what about relocs?? */
/* If not a symbol, fall through to IMMED. */
case e_immed:
- sprintf (s, "%s0x%lx", s, value);
+ sprintf (s_value, "0x%lx", value);
+ strcat (s, s_value);
break;
default:
return 0; /* error; invalid field spec */
break;
default:
return 0; /* error; invalid field spec */