1999-05-03 15:29:11 +08:00
|
|
|
/* sb.h - header file for string buffer manipulation routines
|
2005-03-03 09:29:54 +08:00
|
|
|
Copyright 1994, 1995, 2000, 2003 Free Software Foundation, Inc.
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
Written by Steve and Judy Chamberlain of Cygnus Support,
|
|
|
|
sac@cygnus.com
|
|
|
|
|
|
|
|
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)
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
GAS is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with GAS; see the file COPYING. If not, write to the Free
|
2005-05-05 17:13:19 +08:00
|
|
|
Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
|
|
|
|
02110-1301, USA. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
#ifndef SB_H
|
|
|
|
|
|
|
|
#define SB_H
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "ansidecl.h"
|
|
|
|
|
2005-05-06 16:49:28 +08:00
|
|
|
/* String blocks
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
I had a couple of choices when deciding upon this data structure.
|
|
|
|
gas uses null terminated strings for all its internal work. This
|
|
|
|
often means that parts of the program that want to examine
|
|
|
|
substrings have to manipulate the data in the string to do the
|
|
|
|
right thing (a common operation is to single out a bit of text by
|
|
|
|
saving away the character after it, nulling it out, operating on
|
|
|
|
the substring and then replacing the character which was under the
|
|
|
|
null). This is a pain and I remember a load of problems that I had with
|
|
|
|
code in gas which almost got this right. Also, it's harder to grow and
|
|
|
|
allocate null terminated strings efficiently.
|
|
|
|
|
|
|
|
Obstacks provide all the functionality needed, but are too
|
|
|
|
complicated, hence the sb.
|
|
|
|
|
2003-10-27 20:45:17 +08:00
|
|
|
An sb is allocated by the caller, and is initialized to point to an
|
1999-05-03 15:29:11 +08:00
|
|
|
sb_element. sb_elements are kept on a free lists, and used when
|
2005-05-06 16:49:28 +08:00
|
|
|
needed, replaced onto the free list when unused. */
|
|
|
|
|
|
|
|
#define sb_max_power_two 30 /* Don't allow strings more than
|
|
|
|
2^sb_max_power_two long. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
typedef struct sb
|
2005-05-06 16:49:28 +08:00
|
|
|
{
|
|
|
|
char *ptr; /* Points to the current block. */
|
|
|
|
int len; /* How much is used. */
|
|
|
|
int pot; /* The maximum length is 1<<pot. */
|
|
|
|
struct le *item;
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
sb;
|
|
|
|
|
2005-05-06 16:49:28 +08:00
|
|
|
/* Structure of the free list object of a string block. */
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
typedef struct le
|
2005-05-06 16:49:28 +08:00
|
|
|
{
|
|
|
|
struct le *next;
|
|
|
|
int size;
|
|
|
|
char data[1];
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
sb_element;
|
|
|
|
|
2005-05-06 16:49:28 +08:00
|
|
|
/* The free list. */
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
typedef struct
|
2005-05-06 16:49:28 +08:00
|
|
|
{
|
|
|
|
sb_element *size[sb_max_power_two];
|
|
|
|
}
|
|
|
|
sb_list_vector;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
2003-12-03 11:39:58 +08:00
|
|
|
extern void sb_new (sb *);
|
|
|
|
extern void sb_kill (sb *);
|
|
|
|
extern void sb_add_sb (sb *, sb *);
|
include/elf:
* arm.h: Import complete list of official relocation names
and numbers from AAELF. Define FAKE_RELOCs for old names.
Remove a few old names no longer used anywhere.
bfd:
* elf32-arm.c: Wherever possible, use official reloc names
from AAELF.
(elf32_arm_howto_table, elf32_arm_tls_gd32_howto)
(elf32_arm_tls_ldo32_howto, elf32_arm_tls_ldm32_howto)
(elf32_arm_tls_le32_howto, elf32_arm_tls_ie32_howto)
(elf32_arm_vtinherit_howto, elf32_arm_vtentry_howto)
(elf32_arm_pc11_howto, elf32_arm_thm_pc9_howto, elf32_arm_got_prel)
(elf32_arm_r_howto): Replace with elf32_arm_howto_table_1,
elf32_arm_howto_table_2, and elf32_arm_howto_table_3.
Add many new relocations from AAELF.
(elf32_arm_howto_from_type): Update to match.
(elf32_arm_reloc_map): Add entries for R_ARM_THM_JUMP24,
R_ARM_THM_JUMP11, R_ARM_THM_JUMP19, R_ARM_THM_JUMP8,
R_ARM_THM_JUMP6, R_ARM_GNU_VTINHERIT, and R_ARM_GNU_VTENTRY.
(elf32_arm_reloc_type_lookup): Use elf32_arm_howto_from_type.
(elf32_arm_final_link_relocate): Add support for
R_ARM_THM_JUMP24, R_ARM_THM_JUMP19, R_ARM_THM_JUMP6. Remove
case entries redundant with default.
* reloc.c: Reorganize ARM relocations. Add Thumb
assembler-internal relocations BFD_RELOC_ARM_T32_OFFSET_U8,
BFD_RELOC_ARM_T32_OFFSET_IMM, BFD_RELOC_ARM_T32_IMMEDIATE.
Add visible relocations BFD_RELOC_THUMB_PCREL_BRANCH7,
BFD_RELOC_THUMB_BRANCH20, BFD_RELOC_THUMB_BRANCH25.
Delete unused relocations BFD_RELOC_ARM_GOT12, BFD_RELOC_ARM_COPY.
* bfd-in2.h, libbfd.h: Regenerate.
opcodes:
* arm-dis.c (thumb_opcodes): Add disassembly for V6T2 16-bit
instructions. Adjust disassembly of some opcodes to match
unified syntax.
(thumb32_opcodes): New table.
(print_insn_thumb): Rename print_insn_thumb16; don't handle
two-halfword branches here.
(print_insn_thumb32): New function.
(print_insn): Choose among print_insn_arm, print_insn_thumb16,
and print_insn_thumb32. Be consistent about order of
halfwords when printing 32-bit instructions.
gas:
* hash.c (hash_lookup): Add len parameter. All callers changed.
(hash_find_n): New interface.
* hash.h: Prototype hash_find_n.
* sb.c: Include as.h.
(scrub_from_sb, sb_to_scrub, scrub_position): New statics.
(sb_scrub_and_add_sb): New interface.
* sb.h: Prototype sb_scrub_and_add_sb.
* input-scrub.c (input_scrub_include_sb): Use sb_scrub_and_add_sb.
* config/tc-arm.h (TC_FORCE_RELOCATION_LOCAL): Remove
reference to BFD_RELOC_ARM_GOT12 which is never generated.
* config/tc-arm.c: Rewrite, adding Thumb-2 support.
gas/testsuite:
* gas/arm/arm.exp: Convert all existing "gas_test" tests to
"run_dump_test" tests. Run more tests unconditionally. Run new tests.
* gas/arm/arch4t.s, gas/arm/arch6zk.s, gas/arm/arm3.s, gas/arm/arm6.s
* gas/arm/arm7dm.s, gas/arm/bignum1.s, gas/arm/float.s
* gas/arm/immed.s, gas/arm/iwmmxt.s, gas/arm/offset.s, gas/arm/thumb.s:
Adjust to work as a dump test.
* gas/arm/arch4t.d, gas/arm/arch6zk.d, gas/arm/arm3.d, gas/arm/arm6.d
* gas/arm/arm7dm.d, gas/arm/bignum1.d, gas/arm/float.d
* gas/arm/immed.d, gas/arm/iwmmxt.d, gas/arm/offset.d, gas/arm/thumb.d:
New files.
* gas/arm/armv1-bad.l, gas/arm/armv1-bad.s: Remove tests for
diagnostics that don't happen in the first pass anymore.
* gas/arm/iwmmxt-bad.l, gas/arm/r15-bad.l, gas/arm/req.l
* gas/arm/vfp-bad.l:
Update expected diagnostics.
* gas/arm/pic.d: Update expected reloc name.
* gas/arm/thumbv6.d: CPY no longer appears in disassembly.
* gas/arm/r15-bad.s: Avoid two-argument mul.
* gas/arm/req.s: Adjust comments.
* gas/arm/maverick.d, gas/arm/maverick.s: Avoid inappropriate
use of PC.
* gas/arm/macro-1.d, gas/arm/macro1.s
* gas/arm/t16-bad.l, gas/arm/t16-bad.s
* gas/arm/tcompat.d, gas/arm/tcompat.s
* gas/arm/tcompat2.d, gas/arm/tcompat2.s
* gas/arm/thumb32.d, gas/arm/thumb32.s
New test pair.
ld/testsuite:
* ld-arm/mixed-app.d: Adjust expected disassembly a little.
2005-05-18 13:40:12 +08:00
|
|
|
extern void sb_scrub_and_add_sb (sb *, sb *);
|
2003-12-03 11:39:58 +08:00
|
|
|
extern void sb_reset (sb *);
|
|
|
|
extern void sb_add_char (sb *, int);
|
|
|
|
extern void sb_add_string (sb *, const char *);
|
2005-05-06 15:39:00 +08:00
|
|
|
extern void sb_add_buffer (sb *, const char *, int);
|
2003-12-03 11:39:58 +08:00
|
|
|
extern char *sb_terminate (sb *);
|
|
|
|
extern int sb_skip_white (int, sb *);
|
|
|
|
extern int sb_skip_comma (int, sb *);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
/* Actually in input-scrub.c. */
|
2003-12-03 11:39:58 +08:00
|
|
|
extern void input_scrub_include_sb (sb *, char *, int);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
#endif /* SB_H */
|