aboutsummaryrefslogtreecommitdiff
path: root/tccasm.c
diff options
context:
space:
mode:
Diffstat (limited to 'tccasm.c')
-rw-r--r--tccasm.c87
1 files changed, 46 insertions, 41 deletions
diff --git a/tccasm.c b/tccasm.c
index 28e07fd..fade2d1 100644
--- a/tccasm.c
+++ b/tccasm.c
@@ -331,24 +331,23 @@ static void asm_parse_directive(TCCState *s1)
uint8_t *ptr;
/* assembler directive */
- next();
sec = cur_text_section;
switch(tok) {
- case TOK_ASM_align:
- case TOK_ASM_p2align:
- case TOK_ASM_skip:
- case TOK_ASM_space:
+ case TOK_ASMDIR_align:
+ case TOK_ASMDIR_p2align:
+ case TOK_ASMDIR_skip:
+ case TOK_ASMDIR_space:
tok1 = tok;
next();
n = asm_int_expr(s1);
- if (tok1 == TOK_ASM_p2align)
+ if (tok1 == TOK_ASMDIR_p2align)
{
if (n < 0 || n > 30)
tcc_error("invalid p2align, must be between 0 and 30");
n = 1 << n;
- tok1 = TOK_ASM_align;
+ tok1 = TOK_ASMDIR_align;
}
- if (tok1 == TOK_ASM_align) {
+ if (tok1 == TOK_ASMDIR_align) {
if (n < 0 || (n & (n-1)) != 0)
tcc_error("alignment must be a positive power of two");
offset = (ind + n - 1) & -n;
@@ -372,7 +371,7 @@ static void asm_parse_directive(TCCState *s1)
}
ind += size;
break;
- case TOK_ASM_quad:
+ case TOK_ASMDIR_quad:
next();
for(;;) {
uint64_t vl;
@@ -399,15 +398,15 @@ static void asm_parse_directive(TCCState *s1)
next();
}
break;
- case TOK_ASM_byte:
+ case TOK_ASMDIR_byte:
size = 1;
goto asm_data;
- case TOK_ASM_word:
- case TOK_SHORT:
+ case TOK_ASMDIR_word:
+ case TOK_ASMDIR_short:
size = 2;
goto asm_data;
- case TOK_LONG:
- case TOK_INT:
+ case TOK_ASMDIR_long:
+ case TOK_ASMDIR_int:
size = 4;
asm_data:
next();
@@ -433,7 +432,7 @@ static void asm_parse_directive(TCCState *s1)
next();
}
break;
- case TOK_ASM_fill:
+ case TOK_ASMDIR_fill:
{
int repeat, size, val, i, j;
uint8_t repeat_buf[8];
@@ -475,7 +474,7 @@ static void asm_parse_directive(TCCState *s1)
}
}
break;
- case TOK_ASM_org:
+ case TOK_ASMDIR_org:
{
unsigned long n;
next();
@@ -488,10 +487,10 @@ static void asm_parse_directive(TCCState *s1)
goto zero_pad;
}
break;
- case TOK_ASM_globl:
- case TOK_ASM_global:
- case TOK_ASM_weak:
- case TOK_ASM_hidden:
+ case TOK_ASMDIR_globl:
+ case TOK_ASMDIR_global:
+ case TOK_ASMDIR_weak:
+ case TOK_ASMDIR_hidden:
tok1 = tok;
do {
Sym *sym;
@@ -502,18 +501,18 @@ static void asm_parse_directive(TCCState *s1)
sym = label_push(&s1->asm_labels, tok, 0);
sym->type.t = VT_VOID;
}
- if (tok1 != TOK_ASM_hidden)
+ if (tok1 != TOK_ASMDIR_hidden)
sym->type.t &= ~VT_STATIC;
- if (tok1 == TOK_ASM_weak)
+ if (tok1 == TOK_ASMDIR_weak)
sym->type.t |= VT_WEAK;
- else if (tok1 == TOK_ASM_hidden)
+ else if (tok1 == TOK_ASMDIR_hidden)
sym->type.t |= STV_HIDDEN << VT_VIS_SHIFT;
next();
} while (tok == ',');
break;
- case TOK_ASM_string:
- case TOK_ASM_ascii:
- case TOK_ASM_asciz:
+ case TOK_ASMDIR_string:
+ case TOK_ASMDIR_ascii:
+ case TOK_ASMDIR_asciz:
{
const uint8_t *p;
int i, size, t;
@@ -525,7 +524,7 @@ static void asm_parse_directive(TCCState *s1)
expect("string constant");
p = tokc.str.data;
size = tokc.str.size;
- if (t == TOK_ASM_ascii && size > 0)
+ if (t == TOK_ASMDIR_ascii && size > 0)
size--;
for(i = 0; i < size; i++)
g(p[i]);
@@ -538,9 +537,9 @@ static void asm_parse_directive(TCCState *s1)
}
}
break;
- case TOK_ASM_text:
- case TOK_ASM_data:
- case TOK_ASM_bss:
+ case TOK_ASMDIR_text:
+ case TOK_ASMDIR_data:
+ case TOK_ASMDIR_bss:
{
char sname[64];
tok1 = tok;
@@ -557,7 +556,7 @@ static void asm_parse_directive(TCCState *s1)
use_section(s1, sname);
}
break;
- case TOK_ASM_file:
+ case TOK_ASMDIR_file:
{
char filename[512];
@@ -575,7 +574,7 @@ static void asm_parse_directive(TCCState *s1)
next();
}
break;
- case TOK_ASM_ident:
+ case TOK_ASMDIR_ident:
{
char ident[256];
@@ -593,7 +592,7 @@ static void asm_parse_directive(TCCState *s1)
next();
}
break;
- case TOK_ASM_size:
+ case TOK_ASMDIR_size:
{
Sym *sym;
@@ -614,7 +613,7 @@ static void asm_parse_directive(TCCState *s1)
}
}
break;
- case TOK_ASM_type:
+ case TOK_ASMDIR_type:
{
Sym *sym;
const char *newtype;
@@ -632,7 +631,7 @@ static void asm_parse_directive(TCCState *s1)
newtype = tokc.str.data;
} else {
if (tok == '@' || tok == '%')
- skip(tok);
+ next();
newtype = get_tok_str(tok, NULL);
}
@@ -646,7 +645,7 @@ static void asm_parse_directive(TCCState *s1)
next();
}
break;
- case TOK_SECTION1:
+ case TOK_ASMDIR_section:
{
char sname[256];
@@ -666,12 +665,18 @@ static void asm_parse_directive(TCCState *s1)
if (tok != TOK_STR)
expect("string constant");
next();
+ if (tok == ',') {
+ next();
+ if (tok == '@' || tok == '%')
+ next();
+ next();
+ }
}
last_text_section = cur_text_section;
use_section(s1, sname);
}
break;
- case TOK_ASM_previous:
+ case TOK_ASMDIR_previous:
{
Section *sec;
next();
@@ -683,13 +688,13 @@ static void asm_parse_directive(TCCState *s1)
}
break;
#ifdef TCC_TARGET_I386
- case TOK_ASM_code16:
+ case TOK_ASMDIR_code16:
{
next();
s1->seg_size = 16;
}
break;
- case TOK_ASM_code32:
+ case TOK_ASMDIR_code32:
{
next();
s1->seg_size = 32;
@@ -698,7 +703,7 @@ static void asm_parse_directive(TCCState *s1)
#endif
#ifdef TCC_TARGET_X86_64
/* added for compatibility with GAS */
- case TOK_ASM_code64:
+ case TOK_ASMDIR_code64:
next();
break;
#endif
@@ -763,7 +768,7 @@ static int tcc_assemble_internal(TCCState *s1, int do_preprocess)
/* horrible gas comment */
while (tok != TOK_LINEFEED)
next();
- } else if (tok == '.') {
+ } else if (tok >= TOK_ASMDIR_FIRST && tok <= TOK_ASMDIR_LAST) {
asm_parse_directive(s1);
} else if (tok == TOK_PPNUM) {
const char *p;