aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog8
-rw-r--r--bfd/archures.c4
-rw-r--r--bfd/bfd-in2.h4
-rw-r--r--bfd/coff-tic4x.c15
-rw-r--r--bfd/cpu-tic4x.c22
-rw-r--r--gas/ChangeLog8
-rw-r--r--gas/config/obj-coff.h2
-rw-r--r--gas/config/tc-tic4x.c624
-rw-r--r--gas/config/tc-tic4x.h24
-rw-r--r--include/ChangeLog7
-rw-r--r--include/coff/tic4x.h6
-rw-r--r--include/opcode/tic4x.h58
-rw-r--r--ld/ChangeLog8
-rw-r--r--ld/emulparams/tic3xcoff.sh6
-rw-r--r--ld/emulparams/tic3xcoff_onchip.sh6
-rw-r--r--ld/emulparams/tic4xcoff.sh6
-rw-r--r--ld/scripttempl/tic4xcoff.sc4
-rw-r--r--opcodes/ChangeLog5
-rw-r--r--opcodes/tic4x-dis.c305
19 files changed, 580 insertions, 542 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 809e9f7..180688e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-04 Svein E. Seldal <Svein.Seldal@solidas.com>
+
+ * archures.c: Namespace cleanup. Rename bfd_mach_c3x to
+ bfd_mach_tic3x and bfd_mach_c4x to bfd_mach_tic4x
+ * bfd-in2.h: Regenerate
+ * coff-tic4x.c: Namespace cleanup. Replace s/c4x/tic4x/
+ * cpu-tic4x.c: Ditto
+
2003-04-03 Nick Clifton <nickc@redhat.com>
* peXXigen.c (_bfd_XXi_swap_scnhdr_out): Compute ps and ss
diff --git a/bfd/archures.c b/bfd/archures.c
index 9337fb1..efed993 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -241,8 +241,8 @@ DESCRIPTION
. bfd_arch_w65, {* WDC 65816 *}
. bfd_arch_tic30, {* Texas Instruments TMS320C30 *}
. bfd_arch_tic4x, {* Texas Instruments TMS320C3X/4X *}
-.#define bfd_mach_c3x 30
-.#define bfd_mach_c4x 40
+.#define bfd_mach_tic3x 30
+.#define bfd_mach_tic4x 40
. bfd_arch_tic54x, {* Texas Instruments TMS320C54X *}
. bfd_arch_tic80, {* TI TMS320c80 (MVP) *}
. bfd_arch_v850, {* NEC V850 *}
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index a5ff0c0..749e6aa 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1707,8 +1707,8 @@ enum bfd_architecture
bfd_arch_w65, /* WDC 65816 */
bfd_arch_tic30, /* Texas Instruments TMS320C30 */
bfd_arch_tic4x, /* Texas Instruments TMS320C3X/4X */
-#define bfd_mach_c3x 30
-#define bfd_mach_c4x 40
+#define bfd_mach_tic3x 30
+#define bfd_mach_tic4x 40
bfd_arch_tic54x, /* Texas Instruments TMS320C54X */
bfd_arch_tic80, /* TI TMS320c80 (MVP) */
bfd_arch_v850, /* NEC V850 */
diff --git a/bfd/coff-tic4x.c b/bfd/coff-tic4x.c
index 3062b9f..5c8de41 100644
--- a/bfd/coff-tic4x.c
+++ b/bfd/coff-tic4x.c
@@ -1,6 +1,7 @@
/* BFD back-end for TMS320C4X coff binaries.
- Copyright 1996, 1997, 1998, 1999, 2000, 2002
+ Copyright 1996, 1997, 1998, 1999, 2000, 2002, 2003
Free Software Foundation, Inc.
+
Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz)
This file is part of BFD, the Binary File Descriptor library.
@@ -365,7 +366,7 @@ static const bfd_coff_backend_data ticoff1_swap_table =
/* TI COFF v0, DOS tools (little-endian headers). */
const bfd_target tic4x_coff0_vec =
{
- "coff0-c4x", /* Name. */
+ "coff0-tic4x", /* Name. */
bfd_target_coff_flavour,
BFD_ENDIAN_LITTLE, /* Data byte order is little. */
BFD_ENDIAN_LITTLE, /* Header byte order is little (DOS tools). */
@@ -409,7 +410,7 @@ const bfd_target tic4x_coff0_vec =
/* TI COFF v0, SPARC tools (big-endian headers). */
const bfd_target tic4x_coff0_beh_vec =
{
- "coff0-beh-c4x", /* Name. */
+ "coff0-beh-tic4x", /* Name. */
bfd_target_coff_flavour,
BFD_ENDIAN_LITTLE, /* Data byte order is little. */
BFD_ENDIAN_BIG, /* Header byte order is big. */
@@ -454,7 +455,7 @@ const bfd_target tic4x_coff0_beh_vec =
/* TI COFF v1, DOS tools (little-endian headers). */
const bfd_target tic4x_coff1_vec =
{
- "coff1-c4x", /* Name. */
+ "coff1-tic4x", /* Name. */
bfd_target_coff_flavour,
BFD_ENDIAN_LITTLE, /* Data byte order is little. */
BFD_ENDIAN_LITTLE, /* Header byte order is little (DOS tools). */
@@ -499,7 +500,7 @@ const bfd_target tic4x_coff1_vec =
/* TI COFF v1, SPARC tools (big-endian headers). */
const bfd_target tic4x_coff1_beh_vec =
{
- "coff1-beh-c4x", /* Name. */
+ "coff1-beh-tic4x", /* Name. */
bfd_target_coff_flavour,
BFD_ENDIAN_LITTLE, /* Data byte order is little. */
BFD_ENDIAN_BIG, /* Header byte order is big. */
@@ -544,7 +545,7 @@ const bfd_target tic4x_coff1_beh_vec =
/* TI COFF v2, TI DOS tools output (little-endian headers). */
const bfd_target tic4x_coff2_vec =
{
- "coff2-c4x", /* Name. */
+ "coff2-tic4x", /* Name. */
bfd_target_coff_flavour,
BFD_ENDIAN_LITTLE, /* Data byte order is little. */
BFD_ENDIAN_LITTLE, /* Header byte order is little (DOS tools). */
@@ -589,7 +590,7 @@ const bfd_target tic4x_coff2_vec =
/* TI COFF v2, TI SPARC tools output (big-endian headers). */
const bfd_target tic4x_coff2_beh_vec =
{
- "coff2-beh-c4x", /* Name. */
+ "coff2-beh-tic4x", /* Name. */
bfd_target_coff_flavour,
BFD_ENDIAN_LITTLE, /* Data byte order is little. */
BFD_ENDIAN_BIG, /* Header byte order is big. */
diff --git a/bfd/cpu-tic4x.c b/bfd/cpu-tic4x.c
index 2260f70..a7f40e1 100644
--- a/bfd/cpu-tic4x.c
+++ b/bfd/cpu-tic4x.c
@@ -1,5 +1,5 @@
/* bfd back-end for TMS320C[34]x support
- Copyright 1996, 1997, 2002 Free Software Foundation, Inc.
+ Copyright 1996, 1997, 2002, 2003 Free Software Foundation, Inc.
Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz)
@@ -23,12 +23,12 @@
#include "sysdep.h"
#include "libbfd.h"
-static bfd_boolean c4x_scan
+static bfd_boolean tic4x_scan
PARAMS ((const struct bfd_arch_info *, const char * ));
static bfd_boolean
-c4x_scan (info, string)
+tic4x_scan (info, string)
const struct bfd_arch_info *info;
const char *string;
{
@@ -42,9 +42,9 @@ c4x_scan (info, string)
return FALSE;
if (*string == '3')
- return (info->mach == bfd_mach_c3x);
+ return (info->mach == bfd_mach_tic3x);
else if (*string == '4')
- return info->mach == bfd_mach_c4x;
+ return info->mach == bfd_mach_tic4x;
return FALSE;
}
@@ -56,13 +56,13 @@ const bfd_arch_info_type bfd_tic3x_arch =
32, /* 32 bits in an address. */
32, /* 32 bits in a byte. */
bfd_arch_tic4x,
- bfd_mach_c3x, /* Machine number. */
- "c3x", /* Architecture name. */
+ bfd_mach_tic3x, /* Machine number. */
+ "tic3x", /* Architecture name. */
"tms320c3x", /* Printable name. */
0, /* Alignment power. */
FALSE, /* Not the default architecture. */
bfd_default_compatible,
- c4x_scan,
+ tic4x_scan,
0
};
@@ -72,13 +72,13 @@ const bfd_arch_info_type bfd_tic4x_arch =
32, /* 32 bits in an address. */
32, /* 32 bits in a byte. */
bfd_arch_tic4x,
- bfd_mach_c4x, /* Machine number. */
- "c4x", /* Architecture name. */
+ bfd_mach_tic4x, /* Machine number. */
+ "tic4x", /* Architecture name. */
"tms320c4x", /* Printable name. */
0, /* Alignment power. */
TRUE, /* The default architecture. */
bfd_default_compatible,
- c4x_scan,
+ tic4x_scan,
&bfd_tic3x_arch,
};
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 04b7aad..5a2a322 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-04 Svein E. Seldal <Svein.Seldal@solidas.com>
+
+ * config/obj-coff.h (TARGET_FORMAT): Namespace cleanup, changed
+ default tic4x target format to 'coff2-tic4x'.
+ * config/tc-tic4x.c: Namespace cleanup. Replace s/c4x/tic4x/ and
+ s/c3x/tic3x/
+ * config/tc-tic4x.h: Ditto
+
2003-04-03 Nick Clifton <nickc@redhat.com>
* NEWS: Mention support for Xtensa architecture.
diff --git a/gas/config/obj-coff.h b/gas/config/obj-coff.h
index 6e852be..4349acb 100644
--- a/gas/config/obj-coff.h
+++ b/gas/config/obj-coff.h
@@ -159,7 +159,7 @@
#ifdef TC_TIC4X
#include "coff/tic4x.h"
-#define TARGET_FORMAT "coff2-c4x"
+#define TARGET_FORMAT "coff2-tic4x"
#endif
#ifdef TC_TIC54X
diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c
index 8e5f579..203fb42 100644
--- a/gas/config/tc-tic4x.c
+++ b/gas/config/tc-tic4x.c
@@ -1,5 +1,5 @@
-/* tc-c4x.c -- Assemble for the Texas Instruments TMS320C[34]x.
- Copyright (C) 1997,1998, 2002 Free Software Foundation.
+/* tc-tic4x.c -- Assemble for the Texas Instruments TMS320C[34]x.
+ Copyright (C) 1997,1998, 2002, 2003 Free Software Foundation.
Contributed by Michael P. Hayes (m.hayes@elec.canterbury.ac.nz)
@@ -56,30 +56,30 @@
#include "listing.h"
/* OK, we accept a syntax similar to the other well known C30
- assembly tools. With C4X_ALT_SYNTAX defined we are more
+ assembly tools. With TIC4X_ALT_SYNTAX defined we are more
flexible, allowing a more Unix-like syntax: `%' in front of
register names, `#' in front of immediate constants, and
not requiring `@' in front of direct addresses. */
-#define C4X_ALT_SYNTAX
+#define TIC4X_ALT_SYNTAX
/* Equal to MAX_PRECISION in atof-ieee.c. */
#define MAX_LITTLENUMS 6 /* (12 bytes) */
/* Handle of the inst mnemonic hash table. */
-static struct hash_control *c4x_op_hash = NULL;
+static struct hash_control *tic4x_op_hash = NULL;
/* Handle asg pseudo. */
-static struct hash_control *c4x_asg_hash = NULL;
+static struct hash_control *tic4x_asg_hash = NULL;
-static unsigned int c4x_cpu = 0; /* Default to TMS320C40. */
-static unsigned int c4x_revision = 0; /* CPU revision */
-static unsigned int c4x_idle2 = 0; /* Idle2 support */
-static unsigned int c4x_lowpower = 0; /* Lowpower support */
-static unsigned int c4x_enhanced = 0; /* Enhanced opcode support */
-static unsigned int c4x_big_model = 0; /* Default to small memory model. */
-static unsigned int c4x_reg_args = 0; /* Default to args passed on stack. */
-static unsigned long c4x_oplevel = 0; /* Opcode level */
+static unsigned int tic4x_cpu = 0; /* Default to TMS320C40. */
+static unsigned int tic4x_revision = 0; /* CPU revision */
+static unsigned int tic4x_idle2 = 0; /* Idle2 support */
+static unsigned int tic4x_lowpower = 0; /* Lowpower support */
+static unsigned int tic4x_enhanced = 0; /* Enhanced opcode support */
+static unsigned int tic4x_big_model = 0; /* Default to small memory model. */
+static unsigned int tic4x_reg_args = 0; /* Default to args passed on stack. */
+static unsigned long tic4x_oplevel = 0; /* Opcode level */
#define OPTION_CPU 'm'
#define OPTION_BIG (OPTION_MD_BASE + 1)
@@ -115,21 +115,21 @@ typedef enum
M_UNKNOWN, M_IMMED, M_DIRECT, M_REGISTER, M_INDIRECT,
M_IMMED_F, M_PARALLEL, M_HI
}
-c4x_addr_mode_t;
+tic4x_addr_mode_t;
-typedef struct c4x_operand
+typedef struct tic4x_operand
{
- c4x_addr_mode_t mode; /* Addressing mode. */
+ tic4x_addr_mode_t mode; /* Addressing mode. */
expressionS expr; /* Expression. */
int disp; /* Displacement for indirect addressing. */
int aregno; /* Aux. register number. */
LITTLENUM_TYPE fwords[MAX_LITTLENUMS]; /* Float immed. number. */
}
-c4x_operand_t;
+tic4x_operand_t;
-typedef struct c4x_insn
+typedef struct tic4x_insn
{
- char name[C4X_NAME_MAX]; /* Mnemonic of instruction. */
+ char name[TIC4X_NAME_MAX]; /* Mnemonic of instruction. */
unsigned int in_use; /* True if in_use. */
unsigned int parallel; /* True if parallel instruction. */
unsigned int nchars; /* This is always 4 for the C30. */
@@ -139,81 +139,81 @@ typedef struct c4x_insn
int pcrel; /* True if relocation PC relative. */
char *pname; /* Name of instruction in parallel. */
unsigned int num_operands; /* Number of operands in total. */
- c4x_inst_t *inst; /* Pointer to first template. */
- c4x_operand_t operands[C4X_OPERANDS_MAX];
+ tic4x_inst_t *inst; /* Pointer to first template. */
+ tic4x_operand_t operands[TIC4X_OPERANDS_MAX];
}
-c4x_insn_t;
+tic4x_insn_t;
-static c4x_insn_t the_insn; /* Info about our instruction. */
-static c4x_insn_t *insn = &the_insn;
+static tic4x_insn_t the_insn; /* Info about our instruction. */
+static tic4x_insn_t *insn = &the_insn;
-static int c4x_gen_to_words
+static int tic4x_gen_to_words
PARAMS ((FLONUM_TYPE, LITTLENUM_TYPE *, int ));
-static char *c4x_atof
+static char *tic4x_atof
PARAMS ((char *, char, LITTLENUM_TYPE * ));
-static void c4x_insert_reg
+static void tic4x_insert_reg
PARAMS ((char *, int ));
-static void c4x_insert_sym
+static void tic4x_insert_sym
PARAMS ((char *, int ));
-static char *c4x_expression
+static char *tic4x_expression
PARAMS ((char *, expressionS *));
-static char *c4x_expression_abs
+static char *tic4x_expression_abs
PARAMS ((char *, int *));
-static void c4x_emit_char
+static void tic4x_emit_char
PARAMS ((char, int));
-static void c4x_seg_alloc
+static void tic4x_seg_alloc
PARAMS ((char *, segT, int, symbolS *));
-static void c4x_asg
+static void tic4x_asg
PARAMS ((int));
-static void c4x_bss
+static void tic4x_bss
PARAMS ((int));
-static void c4x_globl
+static void tic4x_globl
PARAMS ((int));
-static void c4x_cons
+static void tic4x_cons
PARAMS ((int));
-static void c4x_stringer
+static void tic4x_stringer
PARAMS ((int));
-static void c4x_eval
+static void tic4x_eval
PARAMS ((int));
-static void c4x_newblock
+static void tic4x_newblock
PARAMS ((int));
-static void c4x_sect
+static void tic4x_sect
PARAMS ((int));
-static void c4x_set
+static void tic4x_set
PARAMS ((int));
-static void c4x_usect
+static void tic4x_usect
PARAMS ((int));
-static void c4x_version
+static void tic4x_version
PARAMS ((int));
-static void c4x_init_regtable
+static void tic4x_init_regtable
PARAMS ((void));
-static void c4x_init_symbols
+static void tic4x_init_symbols
PARAMS ((void));
-static int c4x_inst_insert
- PARAMS ((c4x_inst_t *));
-static c4x_inst_t *c4x_inst_make
+static int tic4x_inst_insert
+ PARAMS ((tic4x_inst_t *));
+static tic4x_inst_t *tic4x_inst_make
PARAMS ((char *, unsigned long, char *));
-static int c4x_inst_add
- PARAMS ((c4x_inst_t *));
+static int tic4x_inst_add
+ PARAMS ((tic4x_inst_t *));
void md_begin
PARAMS ((void));
-void c4x_end
+void tic4x_end
PARAMS ((void));
-static int c4x_indirect_parse
- PARAMS ((c4x_operand_t *, const c4x_indirect_t *));
-static char *c4x_operand_parse
- PARAMS ((char *, c4x_operand_t *));
-static int c4x_operands_match
- PARAMS ((c4x_inst_t *, c4x_insn_t *, int));
-static void c4x_insn_check
- PARAMS ((c4x_insn_t *));
-static void c4x_insn_output
- PARAMS ((c4x_insn_t *));
-static int c4x_operands_parse
- PARAMS ((char *, c4x_operand_t *, int ));
+static int tic4x_indirect_parse
+ PARAMS ((tic4x_operand_t *, const tic4x_indirect_t *));
+static char *tic4x_operand_parse
+ PARAMS ((char *, tic4x_operand_t *));
+static int tic4x_operands_match
+ PARAMS ((tic4x_inst_t *, tic4x_insn_t *, int));
+static void tic4x_insn_check
+ PARAMS ((tic4x_insn_t *));
+static void tic4x_insn_output
+ PARAMS ((tic4x_insn_t *));
+static int tic4x_operands_parse
+ PARAMS ((char *, tic4x_operand_t *, int ));
void md_assemble
PARAMS ((char *));
-void c4x_cleanup
+void tic4x_cleanup
PARAMS ((void));
char *md_atof
PARAMS ((int, char *, int *));
@@ -231,7 +231,7 @@ int md_parse_option
PARAMS ((int, char *));
void md_show_usage
PARAMS ((FILE *));
-int c4x_unrecognized_line
+int tic4x_unrecognized_line
PARAMS ((int));
symbolS *md_undefined_symbol
PARAMS ((char *));
@@ -239,13 +239,13 @@ void md_operand
PARAMS ((expressionS *));
valueT md_section_align
PARAMS ((segT, valueT));
-static int c4x_pc_offset
+static int tic4x_pc_offset
PARAMS ((unsigned int));
long md_pcrel_from
PARAMS ((fixS *));
-int c4x_do_align
+int tic4x_do_align
PARAMS ((int, const char *, int, int));
-void c4x_start_line
+void tic4x_start_line
PARAMS ((void));
arelent *tc_gen_reloc
PARAMS ((asection *, fixS *));
@@ -255,32 +255,32 @@ const pseudo_typeS
md_pseudo_table[] =
{
{"align", s_align_bytes, 32},
- {"ascii", c4x_stringer, 1},
- {"asciz", c4x_stringer, 0},
- {"asg", c4x_asg, 0},
+ {"ascii", tic4x_stringer, 1},
+ {"asciz", tic4x_stringer, 0},
+ {"asg", tic4x_asg, 0},
{"block", s_space, 4},
- {"byte", c4x_cons, 1},
- {"bss", c4x_bss, 0},
+ {"byte", tic4x_cons, 1},
+ {"bss", tic4x_bss, 0},
{"copy", s_include, 0},
- {"def", c4x_globl, 0},
- {"equ", c4x_set, 0},
- {"eval", c4x_eval, 0},
- {"global", c4x_globl, 0},
- {"globl", c4x_globl, 0},
- {"hword", c4x_cons, 2},
+ {"def", tic4x_globl, 0},
+ {"equ", tic4x_set, 0},
+ {"eval", tic4x_eval, 0},
+ {"global", tic4x_globl, 0},
+ {"globl", tic4x_globl, 0},
+ {"hword", tic4x_cons, 2},
{"ieee", float_cons, 'i'},
- {"int", c4x_cons, 4}, /* .int allocates 4 bytes. */
+ {"int", tic4x_cons, 4}, /* .int allocates 4 bytes. */
{"ldouble", float_cons, 'e'},
- {"newblock", c4x_newblock, 0},
+ {"newblock", tic4x_newblock, 0},
{"ref", s_ignore, 0}, /* All undefined treated as external. */
- {"set", c4x_set, 0},
- {"sect", c4x_sect, 1}, /* Define named section. */
+ {"set", tic4x_set, 0},
+ {"sect", tic4x_sect, 1}, /* Define named section. */
{"space", s_space, 4},
- {"string", c4x_stringer, 0},
- {"usect", c4x_usect, 0}, /* Reserve space in uninit. named sect. */
- {"version", c4x_version, 0},
- {"word", c4x_cons, 4}, /* .word allocates 4 bytes. */
- {"xdef", c4x_globl, 0},
+ {"string", tic4x_stringer, 0},
+ {"usect", tic4x_usect, 0}, /* Reserve space in uninit. named sect. */
+ {"version", tic4x_version, 0},
+ {"word", tic4x_cons, 4}, /* .word allocates 4 bytes. */
+ {"xdef", tic4x_globl, 0},
{NULL, 0, 0},
};
@@ -290,7 +290,7 @@ const int md_reloc_size = RELSZ; /* Coff headers. */
/* This array holds the chars that always start a comment. If the
pre-processor is disabled, these aren't very useful. */
-#ifdef C4X_ALT_SYNTAX
+#ifdef TIC4X_ALT_SYNTAX
const char comment_chars[] = ";!";
#else
const char comment_chars[] = ";";
@@ -334,7 +334,7 @@ extern FLONUM_TYPE generic_floating_point_number;
/* Turn generic_floating_point_number into a real short/float/double. */
static int
-c4x_gen_to_words (flonum, words, precision)
+tic4x_gen_to_words (flonum, words, precision)
FLONUM_TYPE flonum;
LITTLENUM_TYPE *words;
int precision;
@@ -651,7 +651,7 @@ c4x_gen_to_words (flonum, words, precision)
/* Returns pointer past text consumed. */
static char *
-c4x_atof (str, what_kind, words)
+tic4x_atof (str, what_kind, words)
char *str;
char what_kind;
LITTLENUM_TYPE *words;
@@ -716,7 +716,7 @@ c4x_atof (str, what_kind, words)
return (NULL);
}
- c4x_gen_to_words (generic_floating_point_number,
+ tic4x_gen_to_words (generic_floating_point_number,
words, precision);
/* Restore the generic_floating_point_number's storage alloc (and
@@ -727,7 +727,7 @@ c4x_atof (str, what_kind, words)
}
static void
-c4x_insert_reg (regname, regnum)
+tic4x_insert_reg (regname, regnum)
char *regname;
int regnum;
{
@@ -745,7 +745,7 @@ c4x_insert_reg (regname, regnum)
}
static void
-c4x_insert_sym (symname, value)
+tic4x_insert_sym (symname, value)
char *symname;
int value;
{
@@ -758,7 +758,7 @@ c4x_insert_sym (symname, value)
}
static char *
-c4x_expression (str, exp)
+tic4x_expression (str, exp)
char *str;
expressionS *exp;
{
@@ -774,7 +774,7 @@ c4x_expression (str, exp)
}
static char *
-c4x_expression_abs (str, value)
+tic4x_expression_abs (str, value)
char *str;
int *value;
{
@@ -790,7 +790,7 @@ c4x_expression_abs (str, value)
}
static void
-c4x_emit_char (c,b)
+tic4x_emit_char (c,b)
char c;
int b;
{
@@ -802,7 +802,7 @@ c4x_emit_char (c,b)
}
static void
-c4x_seg_alloc (name, seg, size, symbolP)
+tic4x_seg_alloc (name, seg, size, symbolP)
char *name ATTRIBUTE_UNUSED;
segT seg ATTRIBUTE_UNUSED;
int size;
@@ -828,7 +828,7 @@ c4x_seg_alloc (name, seg, size, symbolP)
/* .asg ["]character-string["], symbol */
static void
-c4x_asg (x)
+tic4x_asg (x)
int x ATTRIBUTE_UNUSED;
{
char c;
@@ -856,17 +856,17 @@ c4x_asg (x)
tmp = xmalloc (strlen (name) + 1);
strcpy (tmp, name);
name = tmp;
- if (hash_find (c4x_asg_hash, name))
- hash_replace (c4x_asg_hash, name, (PTR) str);
+ if (hash_find (tic4x_asg_hash, name))
+ hash_replace (tic4x_asg_hash, name, (PTR) str);
else
- hash_insert (c4x_asg_hash, name, (PTR) str);
+ hash_insert (tic4x_asg_hash, name, (PTR) str);
*input_line_pointer = c;
demand_empty_rest_of_line ();
}
/* .bss symbol, size */
static void
-c4x_bss (x)
+tic4x_bss (x)
int x ATTRIBUTE_UNUSED;
{
char c;
@@ -890,7 +890,7 @@ c4x_bss (x)
}
input_line_pointer =
- c4x_expression_abs (++input_line_pointer, &size);
+ tic4x_expression_abs (++input_line_pointer, &size);
if (size < 0)
{
as_bad (".bss size %d < 0!", size);
@@ -921,7 +921,7 @@ c4x_bss (x)
}
static void
-c4x_globl (ignore)
+tic4x_globl (ignore)
int ignore ATTRIBUTE_UNUSED;
{
char *name;
@@ -951,7 +951,7 @@ c4x_globl (ignore)
/* Handle .byte, .word. .int, .long */
static void
-c4x_cons (bytes)
+tic4x_cons (bytes)
int bytes;
{
register unsigned int c;
@@ -962,14 +962,14 @@ c4x_cons (bytes)
{
input_line_pointer++;
while (is_a_char (c = next_char_of_string ()))
- c4x_emit_char (c, 4);
+ tic4x_emit_char (c, 4);
know (input_line_pointer[-1] == '\"');
}
else
{
expressionS exp;
- input_line_pointer = c4x_expression (input_line_pointer, &exp);
+ input_line_pointer = tic4x_expression (input_line_pointer, &exp);
if (exp.X_op == O_constant)
{
switch (bytes)
@@ -995,7 +995,7 @@ c4x_cons (bytes)
/* Handle .ascii, .asciz, .string */
static void
-c4x_stringer (append_zero)
+tic4x_stringer (append_zero)
int append_zero; /*ex: bytes */
{
int bytes;
@@ -1010,13 +1010,13 @@ c4x_stringer (append_zero)
input_line_pointer++;
while (is_a_char (c = next_char_of_string ()))
{
- c4x_emit_char (c, 1);
+ tic4x_emit_char (c, 1);
bytes++;
}
if (append_zero)
{
- c4x_emit_char (c, 1);
+ tic4x_emit_char (c, 1);
bytes++;
}
@@ -1026,7 +1026,7 @@ c4x_stringer (append_zero)
{
expressionS exp;
- input_line_pointer = c4x_expression (input_line_pointer, &exp);
+ input_line_pointer = tic4x_expression (input_line_pointer, &exp);
if (exp.X_op != O_constant)
{
as_bad("Non-constant symbols not allowed\n");
@@ -1041,7 +1041,7 @@ c4x_stringer (append_zero)
/* Fill out the rest of the expression with 0's to fill up a full word */
if ( bytes&0x3 )
- c4x_emit_char (0, 4-(bytes&0x3));
+ tic4x_emit_char (0, 4-(bytes&0x3));
input_line_pointer--; /* Put terminator back into stream. */
demand_empty_rest_of_line ();
@@ -1049,7 +1049,7 @@ c4x_stringer (append_zero)
/* .eval expression, symbol */
static void
-c4x_eval (x)
+tic4x_eval (x)
int x ATTRIBUTE_UNUSED;
{
char c;
@@ -1058,7 +1058,7 @@ c4x_eval (x)
SKIP_WHITESPACE ();
input_line_pointer =
- c4x_expression_abs (input_line_pointer, &value);
+ tic4x_expression_abs (input_line_pointer, &value);
if (*input_line_pointer++ != ',')
{
as_bad ("Symbol missing\n");
@@ -1067,12 +1067,12 @@ c4x_eval (x)
name = input_line_pointer;
c = get_symbol_end (); /* Get terminator. */
demand_empty_rest_of_line ();
- c4x_insert_sym (name, value);
+ tic4x_insert_sym (name, value);
}
/* Reset local labels. */
static void
-c4x_newblock (x)
+tic4x_newblock (x)
int x ATTRIBUTE_UNUSED;
{
dollar_label_clear ();
@@ -1081,7 +1081,7 @@ c4x_newblock (x)
/* .sect "section-name" [, value] */
/* .sect ["]section-name[:subsection-name]["] [, value] */
static void
-c4x_sect (x)
+tic4x_sect (x)
int x ATTRIBUTE_UNUSED;
{
char c;
@@ -1119,11 +1119,11 @@ c4x_sect (x)
if (c == ',')
input_line_pointer =
- c4x_expression_abs (input_line_pointer, &num);
+ tic4x_expression_abs (input_line_pointer, &num);
else if (*input_line_pointer == ',')
{
input_line_pointer =
- c4x_expression_abs (++input_line_pointer, &num);
+ tic4x_expression_abs (++input_line_pointer, &num);
}
else
num = 0;
@@ -1155,7 +1155,7 @@ c4x_sect (x)
/* symbol[:] .set value or .set symbol, value */
static void
-c4x_set (x)
+tic4x_set (x)
int x ATTRIBUTE_UNUSED;
{
symbolS *symbolP;
@@ -1185,7 +1185,7 @@ c4x_set (x)
/* [symbol] .usect ["]section-name["], size-in-words [, alignment-flag] */
static void
-c4x_usect (x)
+tic4x_usect (x)
int x ATTRIBUTE_UNUSED;
{
char c;
@@ -1210,11 +1210,11 @@ c4x_usect (x)
if (c == ',')
input_line_pointer =
- c4x_expression_abs (input_line_pointer, &size);
+ tic4x_expression_abs (input_line_pointer, &size);
else if (*input_line_pointer == ',')
{
input_line_pointer =
- c4x_expression_abs (++input_line_pointer, &size);
+ tic4x_expression_abs (++input_line_pointer, &size);
}
else
size = 0;
@@ -1223,7 +1223,7 @@ c4x_usect (x)
if (*input_line_pointer == ',')
{
input_line_pointer =
- c4x_expression_abs (++input_line_pointer, &alignment_flag);
+ tic4x_expression_abs (++input_line_pointer, &alignment_flag);
}
else
alignment_flag = 0;
@@ -1241,7 +1241,7 @@ c4x_usect (x)
if (!bfd_set_section_flags (stdoutput, seg, SEC_ALLOC))
as_warn ("Error setting flags for \"%s\": %s", name,
bfd_errmsg (bfd_get_error ()));
- c4x_seg_alloc (name, seg, size, line_label);
+ tic4x_seg_alloc (name, seg, size, line_label);
if (S_GET_STORAGE_CLASS (line_label) != C_EXT)
S_SET_STORAGE_CLASS (line_label, C_STAT);
@@ -1252,43 +1252,43 @@ c4x_usect (x)
/* .version cpu-version. */
static void
-c4x_version (x)
+tic4x_version (x)
int x ATTRIBUTE_UNUSED;
{
unsigned int temp;
input_line_pointer =
- c4x_expression_abs (input_line_pointer, &temp);
- if (!IS_CPU_C3X (temp) && !IS_CPU_C4X (temp))
+ tic4x_expression_abs (input_line_pointer, &temp);
+ if (!IS_CPU_TIC3X (temp) && !IS_CPU_TIC4X (temp))
as_bad ("This assembler does not support processor generation %d",
temp);
- if (c4x_cpu && temp != c4x_cpu)
+ if (tic4x_cpu && temp != tic4x_cpu)
as_warn ("Changing processor generation on fly not supported...");
- c4x_cpu = temp;
+ tic4x_cpu = temp;
demand_empty_rest_of_line ();
}
static void
-c4x_init_regtable ()
+tic4x_init_regtable ()
{
unsigned int i;
- for (i = 0; i < c3x_num_registers; i++)
- c4x_insert_reg (c3x_registers[i].name,
- c3x_registers[i].regno);
+ for (i = 0; i < tic3x_num_registers; i++)
+ tic4x_insert_reg (tic3x_registers[i].name,
+ tic3x_registers[i].regno);
- if (IS_CPU_C4X (c4x_cpu))
+ if (IS_CPU_TIC4X (tic4x_cpu))
{
- /* Add additional C4x registers, overriding some C3x ones. */
- for (i = 0; i < c4x_num_registers; i++)
- c4x_insert_reg (c4x_registers[i].name,
- c4x_registers[i].regno);
+ /* Add additional Tic4x registers, overriding some C3x ones. */
+ for (i = 0; i < tic4x_num_registers; i++)
+ tic4x_insert_reg (tic4x_registers[i].name,
+ tic4x_registers[i].regno);
}
}
static void
-c4x_init_symbols ()
+tic4x_init_symbols ()
{
/* The TI tools accept case insensitive versions of these symbols,
we don't !
@@ -1317,36 +1317,36 @@ c4x_init_symbols ()
Source: TI: TMS320C3x/C4x Assembly Language Tools User's Guide,
1997, SPRU035C, p. 3-17/3-18. */
- c4x_insert_sym (".REGPARM", c4x_reg_args);
- c4x_insert_sym (".MEMPARM", !c4x_reg_args);
- c4x_insert_sym (".BIGMODEL", c4x_big_model);
- c4x_insert_sym (".C30INTERRUPT", 0);
- c4x_insert_sym (".TMS320xx", c4x_cpu == 0 ? 40 : c4x_cpu);
- c4x_insert_sym (".C3X", c4x_cpu == 30 || c4x_cpu == 31 || c4x_cpu == 32 || c4x_cpu == 33);
- c4x_insert_sym (".C3x", c4x_cpu == 30 || c4x_cpu == 31 || c4x_cpu == 32 || c4x_cpu == 33);
- c4x_insert_sym (".C4X", c4x_cpu == 0 || c4x_cpu == 40 || c4x_cpu == 44);
- c4x_insert_sym (".C4x", c4x_cpu == 0 || c4x_cpu == 40 || c4x_cpu == 44);
+ tic4x_insert_sym (".REGPARM", tic4x_reg_args);
+ tic4x_insert_sym (".MEMPARM", !tic4x_reg_args);
+ tic4x_insert_sym (".BIGMODEL", tic4x_big_model);
+ tic4x_insert_sym (".C30INTERRUPT", 0);
+ tic4x_insert_sym (".TMS320xx", tic4x_cpu == 0 ? 40 : tic4x_cpu);
+ tic4x_insert_sym (".C3X", tic4x_cpu == 30 || tic4x_cpu == 31 || tic4x_cpu == 32 || tic4x_cpu == 33);
+ tic4x_insert_sym (".C3x", tic4x_cpu == 30 || tic4x_cpu == 31 || tic4x_cpu == 32 || tic4x_cpu == 33);
+ tic4x_insert_sym (".C4X", tic4x_cpu == 0 || tic4x_cpu == 40 || tic4x_cpu == 44);
+ tic4x_insert_sym (".C4x", tic4x_cpu == 0 || tic4x_cpu == 40 || tic4x_cpu == 44);
/* Do we need to have the following symbols also in lower case? */
- c4x_insert_sym (".TMS320C30", c4x_cpu == 30 || c4x_cpu == 31 || c4x_cpu == 32 || c4x_cpu == 33);
- c4x_insert_sym (".tms320C30", c4x_cpu == 30 || c4x_cpu == 31 || c4x_cpu == 32 || c4x_cpu == 33);
- c4x_insert_sym (".TMS320C31", c4x_cpu == 31);
- c4x_insert_sym (".tms320C31", c4x_cpu == 31);
- c4x_insert_sym (".TMS320C32", c4x_cpu == 32);
- c4x_insert_sym (".tms320C32", c4x_cpu == 32);
- c4x_insert_sym (".TMS320C33", c4x_cpu == 33);
- c4x_insert_sym (".tms320C33", c4x_cpu == 33);
- c4x_insert_sym (".TMS320C40", c4x_cpu == 40 || c4x_cpu == 44 || c4x_cpu == 0);
- c4x_insert_sym (".tms320C40", c4x_cpu == 40 || c4x_cpu == 44 || c4x_cpu == 0);
- c4x_insert_sym (".TMS320C44", c4x_cpu == 44);
- c4x_insert_sym (".tms320C44", c4x_cpu == 44);
- c4x_insert_sym (".TMX320C40", 0); /* C40 first pass silicon ? */
- c4x_insert_sym (".tmx320C40", 0);
+ tic4x_insert_sym (".TMS320C30", tic4x_cpu == 30 || tic4x_cpu == 31 || tic4x_cpu == 32 || tic4x_cpu == 33);
+ tic4x_insert_sym (".tms320C30", tic4x_cpu == 30 || tic4x_cpu == 31 || tic4x_cpu == 32 || tic4x_cpu == 33);
+ tic4x_insert_sym (".TMS320C31", tic4x_cpu == 31);
+ tic4x_insert_sym (".tms320C31", tic4x_cpu == 31);
+ tic4x_insert_sym (".TMS320C32", tic4x_cpu == 32);
+ tic4x_insert_sym (".tms320C32", tic4x_cpu == 32);
+ tic4x_insert_sym (".TMS320C33", tic4x_cpu == 33);
+ tic4x_insert_sym (".tms320C33", tic4x_cpu == 33);
+ tic4x_insert_sym (".TMS320C40", tic4x_cpu == 40 || tic4x_cpu == 44 || tic4x_cpu == 0);
+ tic4x_insert_sym (".tms320C40", tic4x_cpu == 40 || tic4x_cpu == 44 || tic4x_cpu == 0);
+ tic4x_insert_sym (".TMS320C44", tic4x_cpu == 44);
+ tic4x_insert_sym (".tms320C44", tic4x_cpu == 44);
+ tic4x_insert_sym (".TMX320C40", 0); /* C40 first pass silicon ? */
+ tic4x_insert_sym (".tmx320C40", 0);
}
/* Insert a new instruction template into hash table. */
static int
-c4x_inst_insert (inst)
- c4x_inst_t *inst;
+tic4x_inst_insert (inst)
+ tic4x_inst_t *inst;
{
static char prev_name[16];
const char *retval = NULL;
@@ -1355,7 +1355,7 @@ c4x_inst_insert (inst)
if (!strcmp (inst->name, prev_name) || inst->name[0] == '\0')
return 1;
- retval = hash_insert (c4x_op_hash, inst->name, (PTR) inst);
+ retval = hash_insert (tic4x_op_hash, inst->name, (PTR) inst);
if (retval != NULL)
fprintf (stderr, "internal error: can't hash `%s': %s\n",
inst->name, retval);
@@ -1365,13 +1365,13 @@ c4x_inst_insert (inst)
}
/* Make a new instruction template. */
-static c4x_inst_t *
-c4x_inst_make (name, opcode, args)
+static tic4x_inst_t *
+tic4x_inst_make (name, opcode, args)
char *name;
unsigned long opcode;
char *args;
{
- static c4x_inst_t *insts = NULL;
+ static tic4x_inst_t *insts = NULL;
static char *names = NULL;
static int index = 0;
@@ -1380,8 +1380,8 @@ c4x_inst_make (name, opcode, args)
/* Allocate memory to store name strings. */
names = (char *) xmalloc (sizeof (char) * 8192);
/* Allocate memory for additional insts. */
- insts = (c4x_inst_t *)
- xmalloc (sizeof (c4x_inst_t) * 1024);
+ insts = (tic4x_inst_t *)
+ xmalloc (sizeof (tic4x_inst_t) * 1024);
}
insts[index].name = names;
insts[index].opcode = opcode;
@@ -1399,8 +1399,8 @@ c4x_inst_make (name, opcode, args)
/* Add instruction template, creating dynamic templates as required. */
static int
-c4x_inst_add (insts)
- c4x_inst_t *insts;
+tic4x_inst_add (insts)
+ tic4x_inst_t *insts;
{
char *s = insts->name;
char *d;
@@ -1412,7 +1412,7 @@ c4x_inst_add (insts)
/* We do not care about INSNs that is not a part of our
oplevel setting */
- if (!insts->oplevel & c4x_oplevel)
+ if (!insts->oplevel & tic4x_oplevel)
return ok;
while (1)
@@ -1422,11 +1422,11 @@ c4x_inst_add (insts)
case 'B':
case 'C':
/* Dynamically create all the conditional insts. */
- for (i = 0; i < num_conds; i++)
+ for (i = 0; i < tic4x_num_conds; i++)
{
- c4x_inst_t *inst;
+ tic4x_inst_t *inst;
int k = 0;
- char *c = c4x_conds[i].name;
+ char *c = tic4x_conds[i].name;
char *e = d;
while (*c)
@@ -1437,17 +1437,17 @@ c4x_inst_add (insts)
*e = '\0';
/* If instruction found then have already processed it. */
- if (hash_find (c4x_op_hash, name))
+ if (hash_find (tic4x_op_hash, name))
return 1;
do
{
- inst = c4x_inst_make (name, insts[k].opcode +
- (c4x_conds[i].cond <<
+ inst = tic4x_inst_make (name, insts[k].opcode +
+ (tic4x_conds[i].cond <<
(*s == 'B' ? 16 : 23)),
insts[k].args);
if (k == 0) /* Save strcmp() with following func. */
- ok &= c4x_inst_insert (inst);
+ ok &= tic4x_inst_insert (inst);
k++;
}
while (!strcmp (insts->name,
@@ -1457,7 +1457,7 @@ c4x_inst_add (insts)
break;
case '\0':
- return c4x_inst_insert (insts);
+ return tic4x_inst_insert (insts);
break;
default:
@@ -1478,66 +1478,66 @@ md_begin ()
/* Setup the proper opcode level according to the
commandline parameters */
- c4x_oplevel = OP_C3X;
-
- if ( IS_CPU_C4X(c4x_cpu) )
- c4x_oplevel |= OP_C4X;
-
- if ( ( c4x_cpu == 31 && c4x_revision >= 6)
- || (c4x_cpu == 32 && c4x_revision >= 2)
- || (c4x_cpu == 33)
- || c4x_enhanced )
- c4x_oplevel |= OP_ENH;
-
- if ( ( c4x_cpu == 30 && c4x_revision >= 7)
- || (c4x_cpu == 31 && c4x_revision >= 5)
- || (c4x_cpu == 32)
- || c4x_lowpower )
- c4x_oplevel |= OP_LPWR;
-
- if ( ( c4x_cpu == 30 && c4x_revision >= 7)
- || (c4x_cpu == 31 && c4x_revision >= 5)
- || (c4x_cpu == 32)
- || (c4x_cpu == 33)
- || (c4x_cpu == 40 && c4x_revision >= 5)
- || (c4x_cpu == 44)
- || c4x_idle2 )
- c4x_oplevel |= OP_IDLE2;
+ tic4x_oplevel = OP_C3X;
+
+ if ( IS_CPU_TIC4X(tic4x_cpu) )
+ tic4x_oplevel |= OP_C4X;
+
+ if ( ( tic4x_cpu == 31 && tic4x_revision >= 6)
+ || (tic4x_cpu == 32 && tic4x_revision >= 2)
+ || (tic4x_cpu == 33)
+ || tic4x_enhanced )
+ tic4x_oplevel |= OP_ENH;
+
+ if ( ( tic4x_cpu == 30 && tic4x_revision >= 7)
+ || (tic4x_cpu == 31 && tic4x_revision >= 5)
+ || (tic4x_cpu == 32)
+ || tic4x_lowpower )
+ tic4x_oplevel |= OP_LPWR;
+
+ if ( ( tic4x_cpu == 30 && tic4x_revision >= 7)
+ || (tic4x_cpu == 31 && tic4x_revision >= 5)
+ || (tic4x_cpu == 32)
+ || (tic4x_cpu == 33)
+ || (tic4x_cpu == 40 && tic4x_revision >= 5)
+ || (tic4x_cpu == 44)
+ || tic4x_idle2 )
+ tic4x_oplevel |= OP_IDLE2;
/* Create hash table for mnemonics. */
- c4x_op_hash = hash_new ();
+ tic4x_op_hash = hash_new ();
/* Create hash table for asg pseudo. */
- c4x_asg_hash = hash_new ();
+ tic4x_asg_hash = hash_new ();
/* Add mnemonics to hash table, expanding conditional mnemonics on fly. */
- for (i = 0; i < c4x_num_insts; i++)
- ok &= c4x_inst_add ((void *) &c4x_insts[i]);
+ for (i = 0; i < tic4x_num_insts; i++)
+ ok &= tic4x_inst_add ((void *) &tic4x_insts[i]);
/* Create dummy inst to avoid errors accessing end of table. */
- c4x_inst_make ("", 0, "");
+ tic4x_inst_make ("", 0, "");
if (!ok)
as_fatal ("Broken assembler. No assembly attempted.");
/* Add registers to symbol table. */
- c4x_init_regtable ();
+ tic4x_init_regtable ();
/* Add predefined symbols to symbol table. */
- c4x_init_symbols ();
+ tic4x_init_symbols ();
}
void
-c4x_end ()
+tic4x_end ()
{
bfd_set_arch_mach (stdoutput, bfd_arch_tic4x,
- IS_CPU_C4X (c4x_cpu) ? bfd_mach_c4x : bfd_mach_c3x);
+ IS_CPU_TIC4X (tic4x_cpu) ? bfd_mach_tic4x : bfd_mach_tic3x);
}
static int
-c4x_indirect_parse (operand, indirect)
- c4x_operand_t *operand;
- const c4x_indirect_t *indirect;
+tic4x_indirect_parse (operand, indirect)
+ tic4x_operand_t *operand;
+ const tic4x_indirect_t *indirect;
{
char *n = indirect->name;
char *s = input_line_pointer;
@@ -1552,7 +1552,7 @@ c4x_indirect_parse (operand, indirect)
{
case 'a': /* Need to match aux register. */
b = name;
-#ifdef C4X_ALT_SYNTAX
+#ifdef TIC4X_ALT_SYNTAX
if (*s == '%')
s++;
#endif
@@ -1573,11 +1573,11 @@ c4x_indirect_parse (operand, indirect)
return -1;
case 'd': /* Need to match constant for disp. */
-#ifdef C4X_ALT_SYNTAX
+#ifdef TIC4X_ALT_SYNTAX
if (*s == '%') /* expr() will die if we don't skip this. */
s++;
#endif
- s = c4x_expression (s, &operand->expr);
+ s = tic4x_expression (s, &operand->expr);
if (operand->expr.X_op != O_constant)
return 0;
operand->disp = operand->expr.X_add_number;
@@ -1591,11 +1591,11 @@ c4x_indirect_parse (operand, indirect)
case 'y': /* Need to match IR0. */
case 'z': /* Need to match IR1. */
-#ifdef C4X_ALT_SYNTAX
+#ifdef TIC4X_ALT_SYNTAX
if (*s == '%')
s++;
#endif
- s = c4x_expression (s, &operand->expr);
+ s = tic4x_expression (s, &operand->expr);
if (operand->expr.X_op != O_register)
return 0;
if (operand->expr.X_add_number != REG_IR0
@@ -1635,9 +1635,9 @@ c4x_indirect_parse (operand, indirect)
}
static char *
-c4x_operand_parse (s, operand)
+tic4x_operand_parse (s, operand)
char *s;
- c4x_operand_t *operand;
+ tic4x_operand_t *operand;
{
unsigned int i;
char c;
@@ -1654,7 +1654,7 @@ c4x_operand_parse (s, operand)
str = input_line_pointer;
c = get_symbol_end (); /* Get terminator. */
new = input_line_pointer;
- if (strlen (str) && (entry = hash_find (c4x_asg_hash, str)) != NULL)
+ if (strlen (str) && (entry = hash_find (tic4x_asg_hash, str)) != NULL)
{
*input_line_pointer = c;
input_line_pointer = (char *) entry;
@@ -1668,9 +1668,9 @@ c4x_operand_parse (s, operand)
operand->mode = M_UNKNOWN;
switch (*input_line_pointer)
{
-#ifdef C4X_ALT_SYNTAX
+#ifdef TIC4X_ALT_SYNTAX
case '%':
- input_line_pointer = c4x_expression (++input_line_pointer, exp);
+ input_line_pointer = tic4x_expression (++input_line_pointer, exp);
if (exp->X_op != O_register)
as_bad ("Expecting a register name");
operand->mode = M_REGISTER;
@@ -1678,7 +1678,7 @@ c4x_operand_parse (s, operand)
case '^':
/* Denotes high 16 bits. */
- input_line_pointer = c4x_expression (++input_line_pointer, exp);
+ input_line_pointer = tic4x_expression (++input_line_pointer, exp);
if (exp->X_op == O_constant)
operand->mode = M_IMMED;
else if (exp->X_op == O_big)
@@ -1687,7 +1687,7 @@ c4x_operand_parse (s, operand)
as_bad ("Number too large"); /* bignum required */
else
{
- c4x_gen_to_words (generic_floating_point_number,
+ tic4x_gen_to_words (generic_floating_point_number,
operand->fwords, S_PRECISION);
operand->mode = M_IMMED_F;
}
@@ -1701,7 +1701,7 @@ c4x_operand_parse (s, operand)
}
case '#':
- input_line_pointer = c4x_expression (++input_line_pointer, exp);
+ input_line_pointer = tic4x_expression (++input_line_pointer, exp);
if (exp->X_op == O_constant)
operand->mode = M_IMMED;
else if (exp->X_op == O_big)
@@ -1710,7 +1710,7 @@ c4x_operand_parse (s, operand)
as_bad ("Number too large"); /* bignum required. */
else
{
- c4x_gen_to_words (generic_floating_point_number,
+ tic4x_gen_to_words (generic_floating_point_number,
operand->fwords, S_PRECISION);
operand->mode = M_IMMED_F;
}
@@ -1729,7 +1729,7 @@ c4x_operand_parse (s, operand)
case '\\':
#endif
case '@':
- input_line_pointer = c4x_expression (++input_line_pointer, exp);
+ input_line_pointer = tic4x_expression (++input_line_pointer, exp);
if (exp->X_op != O_constant && exp->X_op != O_symbol)
as_bad ("Bad direct addressing construct %s", s);
if (exp->X_op == O_constant)
@@ -1743,16 +1743,16 @@ c4x_operand_parse (s, operand)
case '*':
ret = -1;
- for (i = 0; i < c4x_num_indirects; i++)
- if ((ret = c4x_indirect_parse (operand, &c4x_indirects[i])))
+ for (i = 0; i < tic4x_num_indirects; i++)
+ if ((ret = tic4x_indirect_parse (operand, &tic4x_indirects[i])))
break;
if (ret < 0)
break;
- if (i < c4x_num_indirects)
+ if (i < tic4x_num_indirects)
{
operand->mode = M_INDIRECT;
/* Indirect addressing mode number. */
- operand->expr.X_add_number = c4x_indirects[i].modn;
+ operand->expr.X_add_number = tic4x_indirects[i].modn;
/* Convert *+ARn(0) to *ARn etc. Maybe we should
squeal about silly ones? */
if (operand->expr.X_add_number < 0x08 && !operand->disp)
@@ -1765,7 +1765,7 @@ c4x_operand_parse (s, operand)
default:
operand->mode = M_IMMED; /* Assume immediate. */
str = input_line_pointer;
- input_line_pointer = c4x_expression (input_line_pointer, exp);
+ input_line_pointer = tic4x_expression (input_line_pointer, exp);
if (exp->X_op == O_register)
{
know (exp->X_add_symbol == 0);
@@ -1779,13 +1779,13 @@ c4x_operand_parse (s, operand)
as_bad ("Number too large"); /* bignum required. */
else
{
- c4x_gen_to_words (generic_floating_point_number,
+ tic4x_gen_to_words (generic_floating_point_number,
operand->fwords, S_PRECISION);
operand->mode = M_IMMED_F;
}
break;
}
-#ifdef C4X_ALT_SYNTAX
+#ifdef TIC4X_ALT_SYNTAX
/* Allow ldi foo, ar0 to be equivalent to ldi @foo, ar0. */
else if (exp->X_op == O_symbol)
{
@@ -1801,15 +1801,15 @@ c4x_operand_parse (s, operand)
}
static int
-c4x_operands_match (inst, insn, check)
- c4x_inst_t *inst;
- c4x_insn_t *insn;
+tic4x_operands_match (inst, insn, check)
+ tic4x_inst_t *inst;
+ tic4x_insn_t *insn;
int check;
{
const char *args = inst->args;
unsigned long opcode = inst->opcode;
int num_operands = insn->num_operands;
- c4x_operand_t *operand = insn->operands;
+ tic4x_operand_t *operand = insn->operands;
expressionS *exp = &operand->expr;
int ret = 1;
int reg;
@@ -1850,8 +1850,8 @@ c4x_operands_match (inst, insn, check)
use an immediate mode form of ldiu or ldpk instruction. */
if (exp->X_op == O_constant)
{
- if( ( IS_CPU_C4X (c4x_cpu) && exp->X_add_number <= 65535 )
- || ( IS_CPU_C3X (c4x_cpu) && exp->X_add_number <= 255 ) )
+ if( ( IS_CPU_TIC4X (tic4x_cpu) && exp->X_add_number <= 65535 )
+ || ( IS_CPU_TIC3X (tic4x_cpu) && exp->X_add_number <= 255 ) )
{
INSERTS (opcode, exp->X_add_number, 15, 0);
continue;
@@ -1924,7 +1924,7 @@ c4x_operands_match (inst, insn, check)
continue;
}
}
- if (IS_CPU_C4X (c4x_cpu))
+ if (IS_CPU_TIC4X (tic4x_cpu))
{
insn->reloc = BFD_RELOC_24_PCREL;
insn->pcrel = 1;
@@ -1938,7 +1938,7 @@ c4x_operands_match (inst, insn, check)
continue;
case 'C':
- if (!IS_CPU_C4X (c4x_cpu))
+ if (!IS_CPU_TIC4X (tic4x_cpu))
break;
if (operand->mode != M_INDIRECT)
break;
@@ -1966,7 +1966,7 @@ c4x_operands_match (inst, insn, check)
break;
reg = exp->X_add_number;
if ( (reg >= REG_R0 && reg <= REG_R7)
- || (IS_CPU_C4X (c4x_cpu) && reg >= REG_R8 && reg <= REG_R11) )
+ || (IS_CPU_TIC4X (tic4x_cpu) && reg >= REG_R8 && reg <= REG_R11) )
INSERTU (opcode, reg, 7, 0);
else
{
@@ -1989,7 +1989,7 @@ c4x_operands_match (inst, insn, check)
/* Create floating point number string. */
sprintf (string, "%d.0", (int) exp->X_add_number);
- c4x_atof (string, 's', operand->fwords);
+ tic4x_atof (string, 's', operand->fwords);
}
INSERTU (opcode, operand->fwords[0], 15, 0);
@@ -2006,7 +2006,7 @@ c4x_operands_match (inst, insn, check)
break;
reg = exp->X_add_number;
if ( (reg >= REG_R0 && reg <= REG_R7)
- || (IS_CPU_C4X (c4x_cpu) && reg >= REG_R8 && reg <= REG_R11) )
+ || (IS_CPU_TIC4X (tic4x_cpu) && reg >= REG_R8 && reg <= REG_R11) )
INSERTU (opcode, reg, 15, 8);
else
{
@@ -2032,7 +2032,7 @@ c4x_operands_match (inst, insn, check)
case 'i':
if ( operand->mode == M_REGISTER
- && c4x_oplevel & OP_ENH )
+ && tic4x_oplevel & OP_ENH )
{
reg = exp->X_add_number;
INSERTU (opcode, reg, 4, 0);
@@ -2046,7 +2046,7 @@ c4x_operands_match (inst, insn, check)
break;
if (operand->disp != 0 && operand->disp != 1)
{
- if (IS_CPU_C4X (c4x_cpu))
+ if (IS_CPU_TIC4X (tic4x_cpu))
break;
if (!check)
as_bad ("Invalid indirect addressing mode displacement %d",
@@ -2060,7 +2060,7 @@ c4x_operands_match (inst, insn, check)
case 'j':
if ( operand->mode == M_REGISTER
- && c4x_oplevel & OP_ENH )
+ && tic4x_oplevel & OP_ENH )
{
reg = exp->X_add_number;
INSERTU (opcode, reg, 12, 8);
@@ -2074,7 +2074,7 @@ c4x_operands_match (inst, insn, check)
break;
if (operand->disp != 0 && operand->disp != 1)
{
- if (IS_CPU_C4X (c4x_cpu))
+ if (IS_CPU_TIC4X (tic4x_cpu))
break;
if (!check)
as_bad ("Invalid indirect addressing mode displacement %d",
@@ -2143,7 +2143,7 @@ c4x_operands_match (inst, insn, check)
continue;
case 'O':
- if (!IS_CPU_C4X (c4x_cpu))
+ if (!IS_CPU_TIC4X (tic4x_cpu))
break;
if (operand->mode != M_INDIRECT)
break;
@@ -2197,7 +2197,7 @@ c4x_operands_match (inst, insn, check)
break;
reg = exp->X_add_number;
if ( (reg >= REG_R0 && reg <= REG_R7)
- || (IS_CPU_C4X (c4x_cpu) && reg >= REG_R8 && reg <= REG_R11) )
+ || (IS_CPU_TIC4X (tic4x_cpu) && reg >= REG_R8 && reg <= REG_R11) )
INSERTU (opcode, reg, 15, 0);
else
{
@@ -2219,7 +2219,7 @@ c4x_operands_match (inst, insn, check)
break;
reg = exp->X_add_number;
if ( (reg >= REG_R0 && reg <= REG_R7)
- || (IS_CPU_C4X (c4x_cpu) && reg >= REG_R8 && reg <= REG_R11) )
+ || (IS_CPU_TIC4X (tic4x_cpu) && reg >= REG_R8 && reg <= REG_R11) )
INSERTU (opcode, reg, 20, 16);
else
{
@@ -2276,8 +2276,8 @@ c4x_operands_match (inst, insn, check)
insn->exp = *exp;
continue;
- case 'T': /* 5-bit immediate value for c4x stik. */
- if (!IS_CPU_C4X (c4x_cpu))
+ case 'T': /* 5-bit immediate value for tic4x stik. */
+ if (!IS_CPU_TIC4X (tic4x_cpu))
break;
if (operand->mode != M_IMMED)
break;
@@ -2337,12 +2337,12 @@ c4x_operands_match (inst, insn, check)
break;
if (exp->X_op == O_constant)
{
- if (exp->X_add_number < 512 && IS_CPU_C4X (c4x_cpu))
+ if (exp->X_add_number < 512 && IS_CPU_TIC4X (tic4x_cpu))
{
INSERTU (opcode, exp->X_add_number, 8, 0);
continue;
}
- else if (exp->X_add_number < 32 && IS_CPU_C3X (c4x_cpu))
+ else if (exp->X_add_number < 32 && IS_CPU_TIC3X (tic4x_cpu))
{
INSERTU (opcode, exp->X_add_number | 0x20, 4, 0);
continue;
@@ -2359,7 +2359,7 @@ c4x_operands_match (inst, insn, check)
break; /* No relocations allowed. */
case 'W': /* Short immediate int (0--7). */
- if (!IS_CPU_C4X (c4x_cpu))
+ if (!IS_CPU_TIC4X (tic4x_cpu))
break;
if (operand->mode != M_IMMED)
break;
@@ -2390,7 +2390,7 @@ c4x_operands_match (inst, insn, check)
insn->exp = *exp;
continue;
- case 'X': /* Expansion register for c4x. */
+ case 'X': /* Expansion register for tic4x. */
if (operand->mode != M_REGISTER)
break;
reg = exp->X_add_number;
@@ -2404,7 +2404,7 @@ c4x_operands_match (inst, insn, check)
}
continue;
- case 'Y': /* Address register for c4x lda. */
+ case 'Y': /* Address register for tic4x lda. */
if (operand->mode != M_REGISTER)
break;
reg = exp->X_add_number;
@@ -2418,7 +2418,7 @@ c4x_operands_match (inst, insn, check)
}
continue;
- case 'Z': /* Expansion register for c4x. */
+ case 'Z': /* Expansion register for tic4x. */
if (operand->mode != M_REGISTER)
break;
reg = exp->X_add_number;
@@ -2475,8 +2475,8 @@ c4x_operands_match (inst, insn, check)
}
static void
-c4x_insn_check (insn)
- c4x_insn_t *insn;
+tic4x_insn_check (insn)
+ tic4x_insn_t *insn;
{
if (!strcmp(insn->name, "lda"))
@@ -2507,8 +2507,8 @@ c4x_insn_check (insn)
}
static void
-c4x_insn_output (insn)
- c4x_insn_t *insn;
+tic4x_insn_output (insn)
+ tic4x_insn_t *insn;
{
char *dst;
@@ -2533,19 +2533,19 @@ c4x_insn_output (insn)
/* Parse the operands. */
int
-c4x_operands_parse (s, operands, num_operands)
+tic4x_operands_parse (s, operands, num_operands)
char *s;
- c4x_operand_t *operands;
+ tic4x_operand_t *operands;
int num_operands;
{
if (!*s)
return num_operands;
do
- s = c4x_operand_parse (s, &operands[num_operands++]);
- while (num_operands < C4X_OPERANDS_MAX && *s++ == ',');
+ s = tic4x_operand_parse (s, &operands[num_operands++]);
+ while (num_operands < TIC4X_OPERANDS_MAX && *s++ == ',');
- if (num_operands > C4X_OPERANDS_MAX)
+ if (num_operands > TIC4X_OPERANDS_MAX)
{
as_bad ("Too many operands scanned");
return -1;
@@ -2564,8 +2564,8 @@ md_assemble (str)
char *s;
int i;
int parsed = 0;
- c4x_inst_t *inst; /* Instruction template. */
- c4x_inst_t *first_inst;
+ tic4x_inst_t *inst; /* Instruction template. */
+ tic4x_inst_t *first_inst;
if (str && insn->parallel)
{
@@ -2580,7 +2580,7 @@ md_assemble (str)
if (*s) /* Null terminate for hash_find. */
*s++ = '\0'; /* and skip past null. */
strcat (insn->name, "_");
- strncat (insn->name, str, C4X_NAME_MAX - strlen (insn->name));
+ strncat (insn->name, str, TIC4X_NAME_MAX - strlen (insn->name));
/* Kludge to overcome problems with scrubber removing
space between mnemonic and indirect operand (starting with *)
@@ -2590,7 +2590,7 @@ md_assemble (str)
insn->operands[insn->num_operands++].mode = M_PARALLEL;
- if ((i = c4x_operands_parse
+ if ((i = tic4x_operands_parse
(s, insn->operands, insn->num_operands)) < 0)
{
insn->parallel = 0;
@@ -2603,8 +2603,8 @@ md_assemble (str)
if (insn->in_use)
{
- if ((insn->inst = (struct c4x_inst *)
- hash_find (c4x_op_hash, insn->name)) == NULL)
+ if ((insn->inst = (struct tic4x_inst *)
+ hash_find (tic4x_op_hash, insn->name)) == NULL)
{
as_bad ("Unknown opcode `%s'.", insn->name);
insn->parallel = 0;
@@ -2616,7 +2616,7 @@ md_assemble (str)
first_inst = NULL;
do
{
- ok = c4x_operands_match (inst, insn, 1);
+ ok = tic4x_operands_match (inst, insn, 1);
if (ok < 0)
{
if (!first_inst)
@@ -2627,13 +2627,13 @@ md_assemble (str)
if (ok > 0)
{
- c4x_insn_check (insn);
- c4x_insn_output (insn);
+ tic4x_insn_check (insn);
+ tic4x_insn_output (insn);
}
else if (!ok)
{
if (first_inst)
- c4x_operands_match (first_inst, insn, 0);
+ tic4x_operands_match (first_inst, insn, 0);
as_bad ("Invalid operands for %s", insn->name);
}
else
@@ -2648,9 +2648,9 @@ md_assemble (str)
s++;
if (*s) /* Null terminate for hash_find. */
*s++ = '\0'; /* and skip past null. */
- strncpy (insn->name, str, C4X_NAME_MAX - 3);
+ strncpy (insn->name, str, TIC4X_NAME_MAX - 3);
- if ((i = c4x_operands_parse (s, insn->operands, 0)) < 0)
+ if ((i = tic4x_operands_parse (s, insn->operands, 0)) < 0)
{
insn->inst = NULL; /* Flag that error occured. */
insn->parallel = 0;
@@ -2666,7 +2666,7 @@ md_assemble (str)
}
void
-c4x_cleanup ()
+tic4x_cleanup ()
{
if (insn->in_use)
md_assemble (NULL);
@@ -2726,7 +2726,7 @@ md_atof (type, litP, sizeP)
if (ieee)
t = atof_ieee (input_line_pointer, type, words);
else
- t = c4x_atof (input_line_pointer, type, words);
+ t = tic4x_atof (input_line_pointer, type, words);
if (t)
input_line_pointer = t;
*sizeP = prec * sizeof (LITTLENUM_TYPE);
@@ -2799,7 +2799,7 @@ md_apply_fix3 (fixP, value, seg)
if (fixP->fx_addsy == NULL && fixP->fx_pcrel == 0) fixP->fx_done = 1;
}
-/* Should never be called for c4x. */
+/* Should never be called for tic4x. */
void
md_convert_frag (headers, sec, fragP)
bfd *headers ATTRIBUTE_UNUSED;
@@ -2809,7 +2809,7 @@ md_convert_frag (headers, sec, fragP)
as_fatal ("md_convert_frag");
}
-/* Should never be called for c4x. */
+/* Should never be called for tic4x. */
void
md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
char *ptr ATTRIBUTE_UNUSED;
@@ -2821,7 +2821,7 @@ md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
as_fatal ("md_create_short_jmp\n");
}
-/* Should never be called for c4x. */
+/* Should never be called for tic4x. */
void
md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
char *ptr ATTRIBUTE_UNUSED;
@@ -2833,7 +2833,7 @@ md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
as_fatal ("md_create_long_jump\n");
}
-/* Should never be called for c4x. */
+/* Should never be called for tic4x. */
int
md_estimate_size_before_relax (fragP, segtype)
register fragS *fragP ATTRIBUTE_UNUSED;
@@ -2854,49 +2854,49 @@ md_parse_option (c, arg)
case OPTION_CPU: /* cpu brand */
if (tolower (*arg) == 'c')
arg++;
- c4x_cpu = atoi (arg);
- if (!IS_CPU_C3X (c4x_cpu) && !IS_CPU_C4X (c4x_cpu))
- as_warn ("Unsupported processor generation %d", c4x_cpu);
+ tic4x_cpu = atoi (arg);
+ if (!IS_CPU_TIC3X (tic4x_cpu) && !IS_CPU_TIC4X (tic4x_cpu))
+ as_warn ("Unsupported processor generation %d", tic4x_cpu);
break;
case OPTION_REV: /* cpu revision */
- c4x_revision = atoi (arg);
+ tic4x_revision = atoi (arg);
break;
case 'b':
as_warn ("Option -b is depreciated, please use -mbig");
case OPTION_BIG: /* big model */
- c4x_big_model = 1;
+ tic4x_big_model = 1;
break;
case 'p':
as_warn ("Option -p is depreciated, please use -mmemparm");
case OPTION_MEMPARM: /* push args */
- c4x_reg_args = 0;
+ tic4x_reg_args = 0;
break;
case 'r':
as_warn ("Option -r is depreciated, please use -mregparm");
case OPTION_REGPARM: /* register args */
- c4x_reg_args = 1;
+ tic4x_reg_args = 1;
break;
case 's':
as_warn ("Option -s is depreciated, please use -msmall");
case OPTION_SMALL: /* small model */
- c4x_big_model = 0;
+ tic4x_big_model = 0;
break;
case OPTION_IDLE2:
- c4x_idle2 = 1;
+ tic4x_idle2 = 1;
break;
case OPTION_LOWPOWER:
- c4x_lowpower = 1;
+ tic4x_lowpower = 1;
break;
case OPTION_ENHANCED:
- c4x_enhanced = 1;
+ tic4x_enhanced = 1;
break;
default:
@@ -2936,7 +2936,7 @@ md_show_usage (stream)
definitions of TI C3x tools style local labels $n where n is a single
decimal digit. */
int
-c4x_unrecognized_line (c)
+tic4x_unrecognized_line (c)
int c;
{
int lab;
@@ -3018,7 +3018,7 @@ md_section_align (segment, size)
}
static int
-c4x_pc_offset (op)
+tic4x_pc_offset (op)
unsigned int op;
{
/* Determine the PC offset for a C[34]x instruction.
@@ -3090,13 +3090,13 @@ md_pcrel_from (fixP)
op = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
return ((fixP->fx_where + fixP->fx_frag->fr_address) >> 2) +
- c4x_pc_offset (op);
+ tic4x_pc_offset (op);
}
/* Fill the alignment area with NOP's on .text, unless fill-data
was specified. */
int
-c4x_do_align (alignment, fill, len, max)
+tic4x_do_align (alignment, fill, len, max)
int alignment ATTRIBUTE_UNUSED;
const char *fill ATTRIBUTE_UNUSED;
int len ATTRIBUTE_UNUSED;
@@ -3129,7 +3129,7 @@ c4x_do_align (alignment, fill, len, max)
/* Look for and remove parallel instruction operator ||. */
void
-c4x_start_line ()
+tic4x_start_line ()
{
char *s = input_line_pointer;
diff --git a/gas/config/tc-tic4x.h b/gas/config/tc-tic4x.h
index b9dd0e5..14b0683 100644
--- a/gas/config/tc-tic4x.h
+++ b/gas/config/tc-tic4x.h
@@ -1,5 +1,5 @@
/* tc-tic4x.h -- Assemble for the Texas TMS320C[34]X.
- Copyright (C) 1997, 2002 Free Software Foundation.
+ Copyright (C) 1997, 2002, 2003 Free Software Foundation.
Contributed by Michael P. Hayes (m.hayes@elec.canterbury.ac.nz)
@@ -20,7 +20,7 @@
the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define TC_TIC4X
-#define C4X
+#define TIC4X
#ifndef BFD_ASSEMBLER
#error TMS320C4x requires BFD_ASSEMBLER
@@ -80,21 +80,21 @@
/* Accept numbers with a suffix, e.g. 0ffffh, 1010b. */
#define NUMBERS_WITH_SUFFIX 1
-extern int c4x_unrecognized_line PARAMS ((int));
-#define tc_unrecognized_line(c) c4x_unrecognized_line (c)
+extern int tic4x_unrecognized_line PARAMS ((int));
+#define tc_unrecognized_line(c) tic4x_unrecognized_line (c)
#define md_number_to_chars number_to_chars_littleendian
-extern int c4x_do_align PARAMS ((int, const char *, int, int));
-#define md_do_align(n,fill,len,max,label) if( c4x_do_align (n,fill,len,max) ) goto label;
+extern int tic4x_do_align PARAMS ((int, const char *, int, int));
+#define md_do_align(n,fill,len,max,label) if( tic4x_do_align (n,fill,len,max) ) goto label;
/* Start of line hook to remove parallel instruction operator || */
-extern void c4x_start_line PARAMS ((void));
-#define md_start_line_hook() c4x_start_line()
+extern void tic4x_start_line PARAMS ((void));
+#define md_start_line_hook() tic4x_start_line()
-extern void c4x_cleanup PARAMS ((void));
-#define md_cleanup() c4x_cleanup()
+extern void tic4x_cleanup PARAMS ((void));
+#define md_cleanup() tic4x_cleanup()
-extern void c4x_end PARAMS ((void));
-#define md_end() c4x_end()
+extern void tic4x_end PARAMS ((void));
+#define md_end() tic4x_end()
diff --git a/include/ChangeLog b/include/ChangeLog
index 9c16fdd..37bf713 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-04 Svein E. Seldal <Svein.Seldal@solidas.com>
+
+ * coff/tic4x.h: Namespace cleanup. Replace s/c4x/tic4x
+ and s/c3x/tic3x/
+ * coff/tc-tic4x.h: Ditto
+ * opcode/tic4x.h: Ditto
+
2003-04-02 Bob Wilson <bob.wilson@acm.org>
* xtensa-config.h: Remove comment indicating that this is a
diff --git a/include/coff/tic4x.h b/include/coff/tic4x.h
index 083cc3b..0d224b2 100644
--- a/include/coff/tic4x.h
+++ b/include/coff/tic4x.h
@@ -1,7 +1,7 @@
/* TI COFF information for Texas Instruments TMS320C4X/C3X.
This file customizes the settings in coff/ti.h.
- Copyright 2002 Free Software Foundation, Inc.
+ Copyright 2002, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,12 +31,12 @@
#define TICOFF_DEFAULT_MAGIC TICOFF2MAGIC
#define TICOFF_TARGET_MACHINE_GET(FLAGS) \
- (((FLAGS) & F_VERS) ? bfd_mach_c4x : bfd_mach_c3x)
+ (((FLAGS) & F_VERS) ? bfd_mach_tic4x : bfd_mach_tic3x)
#define TICOFF_TARGET_MACHINE_SET(FLAGSP, MACHINE) \
do \
{ \
- if ((MACHINE) == bfd_mach_c4x) \
+ if ((MACHINE) == bfd_mach_tic4x) \
*(FLAGSP) |= F_VERS; \
} \
while (0)
diff --git a/include/opcode/tic4x.h b/include/opcode/tic4x.h
index 214965d..0e6af64 100644
--- a/include/opcode/tic4x.h
+++ b/include/opcode/tic4x.h
@@ -1,6 +1,6 @@
/* Table of opcodes for the Texas Instruments TMS320C[34]X family.
- Copyright (c) 2002 Free Software Foundation.
+ Copyright (C) 2002, 2003 Free Software Foundation.
Contributed by Michael P. Hayes (m.hayes@elec.canterbury.ac.nz)
@@ -19,8 +19,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define IS_CPU_C3X(v) ((v) == 30 || (v) == 31 || (v) == 32 || (v) == 33)
-#define IS_CPU_C4X(v) ((v) == 0 || (v) == 40 || (v) == 44)
+#define IS_CPU_TIC3X(v) ((v) == 30 || (v) == 31 || (v) == 32 || (v) == 33)
+#define IS_CPU_TIC4X(v) ((v) == 0 || (v) == 40 || (v) == 44)
/* Define some bitfield extraction/insertion macros. */
#define EXTR(inst, m, l) ((inst) << (31 - (m)) >> (31 - ((m) - (l))))
@@ -50,22 +50,22 @@ c4x_reg_t;
#define REG_IF REG_IIE /* C3x only */
#define REG_IOF REG_IIF /* C3x only */
-#define C3X_REG_MAX REG_RC
-#define C4X_REG_MAX REG_TVTP
+#define TIC3X_REG_MAX REG_RC
+#define TIC4X_REG_MAX REG_TVTP
/* Register table size including C4x expansion regs. */
-#define REG_TABLE_SIZE (C4X_REG_MAX + 1)
+#define REG_TABLE_SIZE (TIC4X_REG_MAX + 1)
-struct c4x_register
+struct tic4x_register
{
char * name;
unsigned long regno;
};
-typedef struct c4x_register c4x_register_t;
+typedef struct tic4x_register tic4x_register_t;
/* We could store register synonyms here. */
-static const c4x_register_t c3x_registers[] =
+static const tic4x_register_t tic3x_registers[] =
{
{"f0", REG_R0},
{"r0", REG_R0},
@@ -106,10 +106,10 @@ static const c4x_register_t c3x_registers[] =
{"", 0}
};
-const unsigned int c3x_num_registers = (((sizeof c3x_registers) / (sizeof c3x_registers[0])) - 1);
+const unsigned int tic3x_num_registers = (((sizeof tic3x_registers) / (sizeof tic3x_registers[0])) - 1);
/* Define C4x registers in addition to C3x registers. */
-static const c4x_register_t c4x_registers[] =
+static const tic4x_register_t tic4x_registers[] =
{
{"die", REG_DIE}, /* Clobbers C3x REG_IE */
{"iie", REG_IIE}, /* Clobbers C3x REG_IF */
@@ -127,19 +127,19 @@ static const c4x_register_t c4x_registers[] =
{"", 0}
};
-const unsigned int c4x_num_registers = (((sizeof c4x_registers) / (sizeof c4x_registers[0])) - 1);
+const unsigned int tic4x_num_registers = (((sizeof tic4x_registers) / (sizeof tic4x_registers[0])) - 1);
-struct c4x_cond
+struct tic4x_cond
{
char * name;
unsigned long cond;
};
-typedef struct c4x_cond c4x_cond_t;
+typedef struct tic4x_cond tic4x_cond_t;
/* Define conditional branch/load suffixes. Put desired form for
disassembler last. */
-static const c4x_cond_t c4x_conds[] =
+static const tic4x_cond_t tic4x_conds[] =
{
{ "u", 0x00 },
{ "c", 0x01 }, { "lo", 0x01 },
@@ -167,22 +167,22 @@ static const c4x_cond_t c4x_conds[] =
{ "", 0x0}
};
-const unsigned int num_conds = (((sizeof c4x_conds) / (sizeof c4x_conds[0])) - 1);
+const unsigned int tic4x_num_conds = (((sizeof tic4x_conds) / (sizeof tic4x_conds[0])) - 1);
-struct c4x_indirect
+struct tic4x_indirect
{
char * name;
unsigned long modn;
};
-typedef struct c4x_indirect c4x_indirect_t;
+typedef struct tic4x_indirect tic4x_indirect_t;
/* Define indirect addressing modes where:
d displacement (signed)
y ir0
z ir1 */
-static const c4x_indirect_t c4x_indirects[] =
+static const tic4x_indirect_t tic4x_indirects[] =
{
{ "*+a(d)", 0x00 },
{ "*-a(d)", 0x01 },
@@ -216,12 +216,12 @@ static const c4x_indirect_t c4x_indirects[] =
{ "", 0x0}
};
-#define C3X_MODN_MAX 0x19
+#define TIC3X_MODN_MAX 0x19
-const unsigned int c4x_num_indirects = (((sizeof c4x_indirects) / (sizeof c4x_indirects[0])) - 1);
+const unsigned int tic4x_num_indirects = (((sizeof tic4x_indirects) / (sizeof tic4x_indirects[0])) - 1);
/* Instruction template. */
-struct c4x_inst
+struct tic4x_inst
{
char * name;
unsigned long opcode;
@@ -230,7 +230,7 @@ struct c4x_inst
unsigned long oplevel;
};
-typedef struct c4x_inst c4x_inst_t;
+typedef struct tic4x_inst tic4x_inst_t;
/* Opcode infix
B condition 16--20 U,C,Z,LO,HI, etc.
@@ -278,8 +278,8 @@ typedef struct c4x_inst c4x_inst_t;
Z expansion reg (C4x) 16--20 [Z] - IVTP, TVTP
*/
-#define C4X_OPERANDS_MAX 7 /* Max number of operands for an inst. */
-#define C4X_NAME_MAX 16 /* Max number of chars in parallel name. */
+#define TIC4X_OPERANDS_MAX 7 /* Max number of operands for an inst. */
+#define TIC4X_NAME_MAX 16 /* Max number of chars in parallel name. */
/* Define the instruction level */
#define OP_C3X 0x1 /* C30 support - supported by all */
@@ -873,8 +873,8 @@ typedef struct c4x_inst c4x_inst_t;
*/
-/* Define c3x opcodes for assembler and disassembler. */
-static const c4x_inst_t c4x_insts[] =
+/* Define tic4x opcodes for assembler and disassembler. */
+static const tic4x_inst_t tic4x_insts[] =
{
/* Put synonyms after the desired forms in table so that they get
overwritten in the lookup table. The disassembler will thus
@@ -1070,10 +1070,10 @@ static const c4x_inst_t c4x_insts[] =
TC_CLASS_INSN( "xor", 0x08000000, OP_C3X ),
QC_CLASS_INSN( "xor", "sti", 0xee000000, OP_C3X ),
- /* Dummy entry, not included in c3x_num_insts. This
+ /* Dummy entry, not included in tic4x_num_insts. This
lets code examine entry i + 1 without checking
if we've run off the end of the table. */
{ "", 0x0, 0x00, "", 0 }
};
-const unsigned int c4x_num_insts = (((sizeof c4x_insts) / (sizeof c4x_insts[0])) - 1);
+const unsigned int tic4x_num_insts = (((sizeof tic4x_insts) / (sizeof tic4x_insts[0])) - 1);
diff --git a/ld/ChangeLog b/ld/ChangeLog
index b31c39d..ffac4e7 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-04 Svein E. Seldal <Svein.Seldal@solidas.com>
+
+ * emulparams/tic3xcoff.sh (SCRIPT_NAME): Namespace
+ cleanup. Replace s/c4x/tic4x and s/c3x/tic3x/
+ * emulparams/tic3xcoff_onchip.sh: Ditto
+ * emulparams/tic4xcoff.sh: Ditto
+ * scripttempl/tic4xcoff.sc: Ditto
+
2003-04-03 Nick Clifton <nickc@redhat.com>
* NEWS: Mention support for Xtensa architecture.
diff --git a/ld/emulparams/tic3xcoff.sh b/ld/emulparams/tic3xcoff.sh
index ebbc3e4..be543bf 100644
--- a/ld/emulparams/tic3xcoff.sh
+++ b/ld/emulparams/tic3xcoff.sh
@@ -1,6 +1,6 @@
SCRIPT_NAME=tic4xcoff
-OUTPUT_FORMAT="coff2-c4x"
-OUTPUT_ARCH="c3x"
-ARCH=c3x
+OUTPUT_FORMAT="coff2-tic4x"
+OUTPUT_ARCH="tic3x"
+ARCH=tic3x
TEMPLATE_NAME=ticoff
OUTPUT_FORMAT_TEMPLATE=tic4x
diff --git a/ld/emulparams/tic3xcoff_onchip.sh b/ld/emulparams/tic3xcoff_onchip.sh
index fdf55e2..1c1f8b1 100644
--- a/ld/emulparams/tic3xcoff_onchip.sh
+++ b/ld/emulparams/tic3xcoff_onchip.sh
@@ -1,7 +1,7 @@
SCRIPT_NAME=tic4xcoff
-OUTPUT_FORMAT="coff2-c4x"
-OUTPUT_ARCH="c3x"
-ARCH=c3x
+OUTPUT_FORMAT="coff2-tic4x"
+OUTPUT_ARCH="tic3x"
+ARCH=tic3x
TEMPLATE_NAME=ticoff
OUTPUT_FORMAT_TEMPLATE=tic4x
ONCHIP=yes
diff --git a/ld/emulparams/tic4xcoff.sh b/ld/emulparams/tic4xcoff.sh
index 9fa1e64..2109572 100644
--- a/ld/emulparams/tic4xcoff.sh
+++ b/ld/emulparams/tic4xcoff.sh
@@ -1,6 +1,6 @@
SCRIPT_NAME=tic4xcoff
-OUTPUT_FORMAT="coff2-c4x"
-OUTPUT_ARCH="c4x"
-ARCH=c4x
+OUTPUT_FORMAT="coff2-tic4x"
+OUTPUT_ARCH="tic4x"
+ARCH=tic4x
TEMPLATE_NAME=ticoff
OUTPUT_FORMAT_TEMPLATE=tic4x
diff --git a/ld/scripttempl/tic4xcoff.sc b/ld/scripttempl/tic4xcoff.sc
index 080ac67..121f3ed 100644
--- a/ld/scripttempl/tic4xcoff.sc
+++ b/ld/scripttempl/tic4xcoff.sc
@@ -31,8 +31,8 @@
# This emulation assumes config 7.
case $OUTPUT_ARCH in
- c3x) OUTPUT_ARCHNAME="TMS320C3x" ;;
- c4x) OUTPUT_ARCHNAME="TMS320C4x" ;;
+ tic3x) OUTPUT_ARCHNAME="TMS320C3x" ;;
+ tic4x) OUTPUT_ARCHNAME="TMS320C4x" ;;
esac
case $ONCHIP in
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index f58e425..683b913 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-04 Svein E. Seldal <Svein.Seldal@solidas.com>
+
+ * tic4x-dis.c: Namespace cleanup. Replace s/c4x/tic4x and
+ s/c3x/tic3x/
+
2003-04-01 Nick Clifton <nickc@redhat.com>
* arm-dis.c: Remove presence of (r) and (tm) symbols.
diff --git a/opcodes/tic4x-dis.c b/opcodes/tic4x-dis.c
index b991693..8e452c0 100644
--- a/opcodes/tic4x-dis.c
+++ b/opcodes/tic4x-dis.c
@@ -1,6 +1,6 @@
/* Print instructions for the Texas TMS320C[34]X, for GDB and GNU Binutils.
- Copyright 2002 Free Software Foundation, Inc.
+ Copyright 2002, 2003 Free Software Foundation, Inc.
Contributed by Michael P. Hayes (m.hayes@elec.canterbury.ac.nz)
@@ -23,10 +23,10 @@
#include "dis-asm.h"
#include "opcode/tic4x.h"
-#define C4X_DEBUG 0
+#define TIC4X_DEBUG 0
-#define C4X_HASH_SIZE 11 /* 11 (bits) and above should give unique entries. */
-#define C4X_SPESOP_SIZE 8 /* Max 8. ops for special instructions */
+#define TIC4X_HASH_SIZE 11 /* 11 (bits) and above should give unique entries. */
+#define TIC4X_SPESOP_SIZE 8 /* Max 8. ops for special instructions */
typedef enum
{
@@ -43,49 +43,49 @@ typedef enum
{
INDIRECT_SHORT,
INDIRECT_LONG,
- INDIRECT_C4X
+ INDIRECT_TIC4X
}
indirect_t;
-static int c4x_version = 0;
-static int c4x_dp = 0;
+static int tic4x_version = 0;
+static int tic4x_dp = 0;
-static int c4x_pc_offset
+static int tic4x_pc_offset
PARAMS ((unsigned int));
-static int c4x_print_char
+static int tic4x_print_char
PARAMS ((struct disassemble_info *, char));
-static int c4x_print_str
+static int tic4x_print_str
PARAMS ((struct disassemble_info *, char *));
-static int c4x_print_register
+static int tic4x_print_register
PARAMS ((struct disassemble_info *, unsigned long));
-static int c4x_print_addr
+static int tic4x_print_addr
PARAMS ((struct disassemble_info *, unsigned long));
-static int c4x_print_relative
+static int tic4x_print_relative
PARAMS ((struct disassemble_info *, unsigned long, long, unsigned long));
-void c4x_print_ftoa
+void tic4x_print_ftoa
PARAMS ((unsigned int, FILE *, fprintf_ftype));
-static int c4x_print_direct
+static int tic4x_print_direct
PARAMS ((struct disassemble_info *, unsigned long));
-static int c4x_print_immed
+static int tic4x_print_immed
PARAMS ((struct disassemble_info *, immed_t, unsigned long));
-static int c4x_print_cond
+static int tic4x_print_cond
PARAMS ((struct disassemble_info *, unsigned int));
-static int c4x_print_indirect
+static int tic4x_print_indirect
PARAMS ((struct disassemble_info *, indirect_t, unsigned long));
-static int c4x_print_op
- PARAMS ((struct disassemble_info *, unsigned long, c4x_inst_t *, unsigned long));
-static void c4x_hash_opcode_special
- PARAMS ((c4x_inst_t **, const c4x_inst_t *));
-static void c4x_hash_opcode
- PARAMS ((c4x_inst_t **, c4x_inst_t **, const c4x_inst_t *, unsigned long));
-static int c4x_disassemble
+static int tic4x_print_op
+ PARAMS ((struct disassemble_info *, unsigned long, tic4x_inst_t *, unsigned long));
+static void tic4x_hash_opcode_special
+ PARAMS ((tic4x_inst_t **, const tic4x_inst_t *));
+static void tic4x_hash_opcode
+ PARAMS ((tic4x_inst_t **, tic4x_inst_t **, const tic4x_inst_t *, unsigned long));
+static int tic4x_disassemble
PARAMS ((unsigned long, unsigned long, struct disassemble_info *));
int print_insn_tic4x
PARAMS ((bfd_vma, struct disassemble_info *));
static int
-c4x_pc_offset (op)
+tic4x_pc_offset (op)
unsigned int op;
{
/* Determine the PC offset for a C[34]x instruction.
@@ -143,7 +143,7 @@ c4x_pc_offset (op)
}
static int
-c4x_print_char (info, ch)
+tic4x_print_char (info, ch)
struct disassemble_info * info;
char ch;
{
@@ -153,7 +153,7 @@ c4x_print_char (info, ch)
}
static int
-c4x_print_str (info, str)
+tic4x_print_str (info, str)
struct disassemble_info *info;
char *str;
{
@@ -163,28 +163,28 @@ c4x_print_str (info, str)
}
static int
-c4x_print_register (info, regno)
+tic4x_print_register (info, regno)
struct disassemble_info *info;
unsigned long regno;
{
- static c4x_register_t **registertable = NULL;
+ static tic4x_register_t **registertable = NULL;
unsigned int i;
if (registertable == NULL)
{
- registertable = (c4x_register_t **)
- xmalloc (sizeof (c4x_register_t *) * REG_TABLE_SIZE);
- for (i = 0; i < c3x_num_registers; i++)
- registertable[c3x_registers[i].regno] = (void *)&c3x_registers[i];
- if (IS_CPU_C4X (c4x_version))
+ registertable = (tic4x_register_t **)
+ xmalloc (sizeof (tic4x_register_t *) * REG_TABLE_SIZE);
+ for (i = 0; i < tic3x_num_registers; i++)
+ registertable[tic3x_registers[i].regno] = (void *)&tic3x_registers[i];
+ if (IS_CPU_TIC4X (tic4x_version))
{
/* Add C4x additional registers, overwriting
any C3x registers if necessary. */
- for (i = 0; i < c4x_num_registers; i++)
- registertable[c4x_registers[i].regno] = (void *)&c4x_registers[i];
+ for (i = 0; i < tic4x_num_registers; i++)
+ registertable[tic4x_registers[i].regno] = (void *)&tic4x_registers[i];
}
}
- if ((int) regno > (IS_CPU_C4X (c4x_version) ? C4X_REG_MAX : C3X_REG_MAX))
+ if ((int) regno > (IS_CPU_TIC4X (tic4x_version) ? TIC4X_REG_MAX : TIC3X_REG_MAX))
return 0;
if (info != NULL)
(*info->fprintf_func) (info->stream, "%s", registertable[regno]->name);
@@ -192,7 +192,7 @@ c4x_print_register (info, regno)
}
static int
-c4x_print_addr (info, addr)
+tic4x_print_addr (info, addr)
struct disassemble_info *info;
unsigned long addr;
{
@@ -202,24 +202,24 @@ c4x_print_addr (info, addr)
}
static int
-c4x_print_relative (info, pc, offset, opcode)
+tic4x_print_relative (info, pc, offset, opcode)
struct disassemble_info *info;
unsigned long pc;
long offset;
unsigned long opcode;
{
- return c4x_print_addr (info, pc + offset + c4x_pc_offset (opcode));
+ return tic4x_print_addr (info, pc + offset + tic4x_pc_offset (opcode));
}
static int
-c4x_print_direct (info, arg)
+tic4x_print_direct (info, arg)
struct disassemble_info *info;
unsigned long arg;
{
if (info != NULL)
{
(*info->fprintf_func) (info->stream, "@");
- c4x_print_addr (info, arg + (c4x_dp << 16));
+ tic4x_print_addr (info, arg + (tic4x_dp << 16));
}
return 1;
}
@@ -227,7 +227,7 @@ c4x_print_direct (info, arg)
/* FIXME: make the floating point stuff not rely on host
floating point arithmetic. */
void
-c4x_print_ftoa (val, stream, pfunc)
+tic4x_print_ftoa (val, stream, pfunc)
unsigned int val;
FILE *stream;
fprintf_ftype pfunc;
@@ -253,7 +253,7 @@ c4x_print_ftoa (val, stream, pfunc)
}
static int
-c4x_print_immed (info, type, arg)
+tic4x_print_immed (info, type, arg)
struct disassemble_info *info;
immed_t type;
unsigned long arg;
@@ -312,18 +312,18 @@ c4x_print_immed (info, type, arg)
}
static int
-c4x_print_cond (info, cond)
+tic4x_print_cond (info, cond)
struct disassemble_info *info;
unsigned int cond;
{
- static c4x_cond_t **condtable = NULL;
+ static tic4x_cond_t **condtable = NULL;
unsigned int i;
if (condtable == NULL)
{
- condtable = (c4x_cond_t **)xmalloc (sizeof (c4x_cond_t *) * 32);
- for (i = 0; i < num_conds; i++)
- condtable[c4x_conds[i].cond] = (void *)&c4x_conds[i];
+ condtable = (tic4x_cond_t **)xmalloc (sizeof (tic4x_cond_t *) * 32);
+ for (i = 0; i < tic4x_num_conds; i++)
+ condtable[tic4x_conds[i].cond] = (void *)&tic4x_conds[i];
}
if (cond > 31 || condtable[cond] == NULL)
return 0;
@@ -333,7 +333,7 @@ c4x_print_cond (info, cond)
}
static int
-c4x_print_indirect (info, type, arg)
+tic4x_print_indirect (info, type, arg)
struct disassemble_info *info;
indirect_t type;
unsigned long arg;
@@ -348,7 +348,7 @@ c4x_print_indirect (info, type, arg)
disp = 1;
switch(type)
{
- case INDIRECT_C4X: /* *+ARn(disp) */
+ case INDIRECT_TIC4X: /* *+ARn(disp) */
disp = EXTRU (arg, 7, 3);
aregno = EXTRU (arg, 2, 0) + REG_AR0;
modn = 0;
@@ -366,29 +366,30 @@ c4x_print_indirect (info, type, arg)
return 0;
break;
default:
- abort ();
+ (*info->fprintf_func)(info->stream, "# internal error: Unknown indirect type %d", type);
+ return 0;
}
- if (modn > C3X_MODN_MAX)
+ if (modn > TIC3X_MODN_MAX)
return 0;
- a = c4x_indirects[modn].name;
+ a = tic4x_indirects[modn].name;
while (*a)
{
switch (*a)
{
case 'a':
- c4x_print_register (info, aregno);
+ tic4x_print_register (info, aregno);
break;
case 'd':
- c4x_print_immed (info, IMMED_UINT, disp);
+ tic4x_print_immed (info, IMMED_UINT, disp);
break;
case 'y':
- c4x_print_str (info, "ir0");
+ tic4x_print_str (info, "ir0");
break;
case 'z':
- c4x_print_str (info, "ir1");
+ tic4x_print_str (info, "ir1");
break;
default:
- c4x_print_char (info, *a);
+ tic4x_print_char (info, *a);
break;
}
a++;
@@ -397,10 +398,10 @@ c4x_print_indirect (info, type, arg)
}
static int
-c4x_print_op (info, instruction, p, pc)
+tic4x_print_op (info, instruction, p, pc)
struct disassemble_info *info;
unsigned long instruction;
- c4x_inst_t *p;
+ tic4x_inst_t *p;
unsigned long pc;
{
int val;
@@ -414,18 +415,18 @@ c4x_print_op (info, instruction, p, pc)
switch (*s)
{
case 'B':
- if (! c4x_print_cond (info, EXTRU (instruction, 20, 16)))
+ if (! tic4x_print_cond (info, EXTRU (instruction, 20, 16)))
return 0;
break;
case 'C':
- if (! c4x_print_cond (info, EXTRU (instruction, 27, 23)))
+ if (! tic4x_print_cond (info, EXTRU (instruction, 27, 23)))
return 0;
break;
case '_':
parallel = s + 1; /* Skip past `_' in name */
break;
default:
- c4x_print_char (info, *s);
+ tic4x_print_char (info, *s);
break;
}
s++;
@@ -434,45 +435,45 @@ c4x_print_op (info, instruction, p, pc)
/* Print arguments. */
s = p->args;
if (*s)
- c4x_print_char (info, ' ');
+ tic4x_print_char (info, ' ');
while (*s)
{
switch (*s)
{
case '*': /* indirect 0--15 */
- if (! c4x_print_indirect (info, INDIRECT_LONG,
+ if (! tic4x_print_indirect (info, INDIRECT_LONG,
EXTRU (instruction, 15, 0)))
return 0;
break;
case '#': /* only used for ldp, ldpk */
- c4x_print_immed (info, IMMED_UINT, EXTRU (instruction, 15, 0));
+ tic4x_print_immed (info, IMMED_UINT, EXTRU (instruction, 15, 0));
break;
case '@': /* direct 0--15 */
- c4x_print_direct (info, EXTRU (instruction, 15, 0));
+ tic4x_print_direct (info, EXTRU (instruction, 15, 0));
break;
case 'A': /* address register 24--22 */
- if (! c4x_print_register (info, EXTRU (instruction, 24, 22) +
+ if (! tic4x_print_register (info, EXTRU (instruction, 24, 22) +
REG_AR0))
return 0;
break;
case 'B': /* 24-bit unsigned int immediate br(d)/call/rptb
address 0--23. */
- if (IS_CPU_C4X (c4x_version))
- c4x_print_relative (info, pc, EXTRS (instruction, 23, 0),
+ if (IS_CPU_TIC4X (tic4x_version))
+ tic4x_print_relative (info, pc, EXTRS (instruction, 23, 0),
p->opcode);
else
- c4x_print_addr (info, EXTRU (instruction, 23, 0));
+ tic4x_print_addr (info, EXTRU (instruction, 23, 0));
break;
case 'C': /* indirect (short C4x) 0--7 */
- if (! IS_CPU_C4X (c4x_version))
+ if (! IS_CPU_TIC4X (tic4x_version))
return 0;
- if (! c4x_print_indirect (info, INDIRECT_C4X,
+ if (! tic4x_print_indirect (info, INDIRECT_TIC4X,
EXTRU (instruction, 7, 0)))
return 0;
break;
@@ -483,26 +484,26 @@ c4x_print_op (info, instruction, p, pc)
case 'E': /* register 0--7 */
case 'e':
- if (! c4x_print_register (info, EXTRU (instruction, 7, 0)))
+ if (! tic4x_print_register (info, EXTRU (instruction, 7, 0)))
return 0;
break;
case 'F': /* 16-bit float immediate 0--15 */
- c4x_print_immed (info, IMMED_SFLOAT,
+ tic4x_print_immed (info, IMMED_SFLOAT,
EXTRU (instruction, 15, 0));
break;
case 'i': /* Extended indirect 0--7 */
if ( EXTRU (instruction, 7, 5) == 7 )
{
- if( !c4x_print_register (info, EXTRU (instruction, 4, 0)) )
+ if( !tic4x_print_register (info, EXTRU (instruction, 4, 0)) )
return 0;
break;
}
/* Fallthrough */
case 'I': /* indirect (short) 0--7 */
- if (! c4x_print_indirect (info, INDIRECT_SHORT,
+ if (! tic4x_print_indirect (info, INDIRECT_SHORT,
EXTRU (instruction, 7, 0)))
return 0;
break;
@@ -510,106 +511,106 @@ c4x_print_op (info, instruction, p, pc)
case 'j': /* Extended indirect 8--15 */
if ( EXTRU (instruction, 15, 13) == 7 )
{
- if( !c4x_print_register (info, EXTRU (instruction, 12, 8)) )
+ if( !tic4x_print_register (info, EXTRU (instruction, 12, 8)) )
return 0;
break;
}
case 'J': /* indirect (short) 8--15 */
- if (! c4x_print_indirect (info, INDIRECT_SHORT,
+ if (! tic4x_print_indirect (info, INDIRECT_SHORT,
EXTRU (instruction, 15, 8)))
return 0;
break;
case 'G': /* register 8--15 */
case 'g':
- if (! c4x_print_register (info, EXTRU (instruction, 15, 8)))
+ if (! tic4x_print_register (info, EXTRU (instruction, 15, 8)))
return 0;
break;
case 'H': /* register 16--18 */
- if (! c4x_print_register (info, EXTRU (instruction, 18, 16)))
+ if (! tic4x_print_register (info, EXTRU (instruction, 18, 16)))
return 0;
break;
case 'K': /* register 19--21 */
- if (! c4x_print_register (info, EXTRU (instruction, 21, 19)))
+ if (! tic4x_print_register (info, EXTRU (instruction, 21, 19)))
return 0;
break;
case 'L': /* register 22--24 */
- if (! c4x_print_register (info, EXTRU (instruction, 24, 22)))
+ if (! tic4x_print_register (info, EXTRU (instruction, 24, 22)))
return 0;
break;
case 'M': /* register 22--22 */
- c4x_print_register (info, EXTRU (instruction, 22, 22) + REG_R2);
+ tic4x_print_register (info, EXTRU (instruction, 22, 22) + REG_R2);
break;
case 'N': /* register 23--23 */
- c4x_print_register (info, EXTRU (instruction, 23, 23) + REG_R0);
+ tic4x_print_register (info, EXTRU (instruction, 23, 23) + REG_R0);
break;
case 'O': /* indirect (short C4x) 8--15 */
- if (! IS_CPU_C4X (c4x_version))
+ if (! IS_CPU_TIC4X (tic4x_version))
return 0;
- if (! c4x_print_indirect (info, INDIRECT_C4X,
+ if (! tic4x_print_indirect (info, INDIRECT_TIC4X,
EXTRU (instruction, 15, 8)))
return 0;
break;
case 'P': /* displacement 0--15 (used by Bcond and BcondD) */
- c4x_print_relative (info, pc, EXTRS (instruction, 15, 0),
+ tic4x_print_relative (info, pc, EXTRS (instruction, 15, 0),
p->opcode);
break;
case 'Q': /* register 0--15 */
case 'q':
- if (! c4x_print_register (info, EXTRU (instruction, 15, 0)))
+ if (! tic4x_print_register (info, EXTRU (instruction, 15, 0)))
return 0;
break;
case 'R': /* register 16--20 */
case 'r':
- if (! c4x_print_register (info, EXTRU (instruction, 20, 16)))
+ if (! tic4x_print_register (info, EXTRU (instruction, 20, 16)))
return 0;
break;
case 'S': /* 16-bit signed immediate 0--15 */
- c4x_print_immed (info, IMMED_SINT,
+ tic4x_print_immed (info, IMMED_SINT,
EXTRS (instruction, 15, 0));
break;
case 'T': /* 5-bit signed immediate 16--20 (C4x stik) */
- if (! IS_CPU_C4X (c4x_version))
+ if (! IS_CPU_TIC4X (tic4x_version))
return 0;
- if (! c4x_print_immed (info, IMMED_SUINT,
+ if (! tic4x_print_immed (info, IMMED_SUINT,
EXTRU (instruction, 20, 16)))
return 0;
break;
case 'U': /* 16-bit unsigned int immediate 0--15 */
- c4x_print_immed (info, IMMED_SUINT, EXTRU (instruction, 15, 0));
+ tic4x_print_immed (info, IMMED_SUINT, EXTRU (instruction, 15, 0));
break;
case 'V': /* 5/9-bit unsigned vector 0--4/8 */
- c4x_print_immed (info, IMMED_SUINT,
- IS_CPU_C4X (c4x_version) ?
+ tic4x_print_immed (info, IMMED_SUINT,
+ IS_CPU_TIC4X (tic4x_version) ?
EXTRU (instruction, 8, 0) :
EXTRU (instruction, 4, 0) & ~0x20);
break;
case 'W': /* 8-bit signed immediate 0--7 */
- if (! IS_CPU_C4X (c4x_version))
+ if (! IS_CPU_TIC4X (tic4x_version))
return 0;
- c4x_print_immed (info, IMMED_SINT, EXTRS (instruction, 7, 0));
+ tic4x_print_immed (info, IMMED_SINT, EXTRS (instruction, 7, 0));
break;
case 'X': /* expansion register 4--0 */
val = EXTRU (instruction, 4, 0) + REG_IVTP;
if (val < REG_IVTP || val > REG_TVTP)
return 0;
- if (! c4x_print_register (info, val))
+ if (! tic4x_print_register (info, val))
return 0;
break;
@@ -617,7 +618,7 @@ c4x_print_op (info, instruction, p, pc)
val = EXTRU (instruction, 20, 16);
if (val < REG_AR0 || val > REG_SP)
return 0;
- if (! c4x_print_register (info, val))
+ if (! tic4x_print_register (info, val))
return 0;
break;
@@ -625,22 +626,22 @@ c4x_print_op (info, instruction, p, pc)
val = EXTRU (instruction, 20, 16) + REG_IVTP;
if (val < REG_IVTP || val > REG_TVTP)
return 0;
- if (! c4x_print_register (info, val))
+ if (! tic4x_print_register (info, val))
return 0;
break;
case '|': /* Parallel instruction */
- c4x_print_str (info, " || ");
- c4x_print_str (info, parallel);
- c4x_print_char (info, ' ');
+ tic4x_print_str (info, " || ");
+ tic4x_print_str (info, parallel);
+ tic4x_print_char (info, ' ');
break;
case ';':
- c4x_print_char (info, ',');
+ tic4x_print_char (info, ',');
break;
default:
- c4x_print_char (info, *s);
+ tic4x_print_char (info, *s);
break;
}
s++;
@@ -649,13 +650,13 @@ c4x_print_op (info, instruction, p, pc)
}
static void
-c4x_hash_opcode_special (optable_special, inst)
- c4x_inst_t **optable_special;
- const c4x_inst_t *inst;
+tic4x_hash_opcode_special (optable_special, inst)
+ tic4x_inst_t **optable_special;
+ const tic4x_inst_t *inst;
{
int i;
- for( i=0; i<C4X_SPESOP_SIZE; i++ )
+ for( i=0; i<TIC4X_SPESOP_SIZE; i++ )
if( optable_special[i] != NULL
&& optable_special[i]->opcode == inst->opcode )
{
@@ -664,7 +665,7 @@ c4x_hash_opcode_special (optable_special, inst)
return;
}
- for( i=0; i<C4X_SPESOP_SIZE; i++ )
+ for( i=0; i<TIC4X_SPESOP_SIZE; i++ )
if( optable_special[i] == NULL )
{
/* Add the new opcode */
@@ -673,32 +674,32 @@ c4x_hash_opcode_special (optable_special, inst)
}
/* This should never occur. This happens if the number of special
- instructions exceeds C4X_SPESOP_SIZE. Please increase the variable
+ instructions exceeds TIC4X_SPESOP_SIZE. Please increase the variable
of this variable */
-#if C4X_DEBUG
- printf("optable_special[] is full, please increase C4X_SPESOP_SIZE!\n");
+#if TIC4X_DEBUG
+ printf("optable_special[] is full, please increase TIC4X_SPESOP_SIZE!\n");
#endif
}
static void
-c4x_hash_opcode (optable, optable_special, inst, c4x_oplevel)
- c4x_inst_t **optable;
- c4x_inst_t **optable_special;
- const c4x_inst_t *inst;
- const unsigned long c4x_oplevel;
+tic4x_hash_opcode (optable, optable_special, inst, tic4x_oplevel)
+ tic4x_inst_t **optable;
+ tic4x_inst_t **optable_special;
+ const tic4x_inst_t *inst;
+ const unsigned long tic4x_oplevel;
{
int j;
- int opcode = inst->opcode >> (32 - C4X_HASH_SIZE);
- int opmask = inst->opmask >> (32 - C4X_HASH_SIZE);
+ int opcode = inst->opcode >> (32 - TIC4X_HASH_SIZE);
+ int opmask = inst->opmask >> (32 - TIC4X_HASH_SIZE);
- /* Use a C4X_HASH_SIZE bit index as a hash index. We should
+ /* Use a TIC4X_HASH_SIZE bit index as a hash index. We should
have unique entries so there's no point having a linked list
for each entry? */
for (j = opcode; j < opmask; j++)
if ( (j & opmask) == opcode
- && inst->oplevel & c4x_oplevel )
+ && inst->oplevel & tic4x_oplevel )
{
-#if C4X_DEBUG
+#if TIC4X_DEBUG
/* We should only have collisions for synonyms like
ldp for ldi. */
if (optable[j] != NULL)
@@ -710,13 +711,13 @@ c4x_hash_opcode (optable, optable_special, inst, c4x_oplevel)
hash. Store them in a special-list, that will handle full
32-bit INSN, not only the first 11-bit (or so). */
if ( optable[j] != NULL
- && inst->opmask & ~(opmask << (32 - C4X_HASH_SIZE)) )
+ && inst->opmask & ~(opmask << (32 - TIC4X_HASH_SIZE)) )
{
/* Add the instruction already on the list */
- c4x_hash_opcode_special(optable_special, optable[j]);
+ tic4x_hash_opcode_special(optable_special, optable[j]);
/* Add the new instruction */
- c4x_hash_opcode_special(optable_special, inst);
+ tic4x_hash_opcode_special(optable_special, inst);
}
optable[j] = (void *)inst;
@@ -730,67 +731,67 @@ c4x_hash_opcode (optable, optable_special, inst, c4x_oplevel)
The function returns the length of this instruction in words. */
static int
-c4x_disassemble (pc, instruction, info)
+tic4x_disassemble (pc, instruction, info)
unsigned long pc;
unsigned long instruction;
struct disassemble_info *info;
{
- static c4x_inst_t **optable = NULL;
- static c4x_inst_t **optable_special = NULL;
- c4x_inst_t *p;
+ static tic4x_inst_t **optable = NULL;
+ static tic4x_inst_t **optable_special = NULL;
+ tic4x_inst_t *p;
int i;
- unsigned long c4x_oplevel;
+ unsigned long tic4x_oplevel;
- c4x_version = info->mach;
+ tic4x_version = info->mach;
- c4x_oplevel = (IS_CPU_C4X (c4x_version)) ? OP_C4X : 0;
- c4x_oplevel |= OP_C3X|OP_LPWR|OP_IDLE2|OP_ENH;
+ tic4x_oplevel = (IS_CPU_TIC4X (tic4x_version)) ? OP_C4X : 0;
+ tic4x_oplevel |= OP_C3X|OP_LPWR|OP_IDLE2|OP_ENH;
if (optable == NULL)
{
- optable = (c4x_inst_t **)
- xcalloc (sizeof (c4x_inst_t *), (1 << C4X_HASH_SIZE));
+ optable = (tic4x_inst_t **)
+ xcalloc (sizeof (tic4x_inst_t *), (1 << TIC4X_HASH_SIZE));
- optable_special = (c4x_inst_t **)
- xcalloc (sizeof (c4x_inst_t *), C4X_SPESOP_SIZE );
+ optable_special = (tic4x_inst_t **)
+ xcalloc (sizeof (tic4x_inst_t *), TIC4X_SPESOP_SIZE );
/* Install opcodes in reverse order so that preferred
forms overwrite synonyms. */
- for (i = c4x_num_insts - 1; i >= 0; i--)
- c4x_hash_opcode (optable, optable_special, &c4x_insts[i], c4x_oplevel);
+ for (i = tic4x_num_insts - 1; i >= 0; i--)
+ tic4x_hash_opcode (optable, optable_special, &tic4x_insts[i], tic4x_oplevel);
/* We now need to remove the insn that are special from the
"normal" optable, to make the disasm search this extra list
for them.
*/
- for (i=0; i<C4X_SPESOP_SIZE; i++)
+ for (i=0; i<TIC4X_SPESOP_SIZE; i++)
if ( optable_special[i] != NULL )
- optable[optable_special[i]->opcode >> (32 - C4X_HASH_SIZE)] = NULL;
+ optable[optable_special[i]->opcode >> (32 - TIC4X_HASH_SIZE)] = NULL;
}
/* See if we can pick up any loading of the DP register... */
if ((instruction >> 16) == 0x5070 || (instruction >> 16) == 0x1f70)
- c4x_dp = EXTRU (instruction, 15, 0);
+ tic4x_dp = EXTRU (instruction, 15, 0);
- p = optable[instruction >> (32 - C4X_HASH_SIZE)];
+ p = optable[instruction >> (32 - TIC4X_HASH_SIZE)];
if ( p != NULL )
{
if ( ((instruction & p->opmask) == p->opcode)
- && c4x_print_op (NULL, instruction, p, pc) )
- c4x_print_op (info, instruction, p, pc);
+ && tic4x_print_op (NULL, instruction, p, pc) )
+ tic4x_print_op (info, instruction, p, pc);
else
(*info->fprintf_func) (info->stream, "%08x", instruction);
}
else
{
- for (i = 0; i<C4X_SPESOP_SIZE; i++)
+ for (i = 0; i<TIC4X_SPESOP_SIZE; i++)
if (optable_special[i] != NULL
&& optable_special[i]->opcode == instruction )
{
(*info->fprintf_func)(info->stream, "%s", optable_special[i]->name);
break;
}
- if (i==C4X_SPESOP_SIZE)
+ if (i==TIC4X_SPESOP_SIZE)
(*info->fprintf_func) (info->stream, "%08x", instruction);
}
@@ -822,5 +823,5 @@ print_insn_tic4x (memaddr, info)
info->bytes_per_chunk = 4;
info->octets_per_byte = 4;
info->display_endian = BFD_ENDIAN_LITTLE;
- return c4x_disassemble (pc, op, info) * 4;
+ return tic4x_disassemble (pc, op, info) * 4;
}