mirrors/tinycc
1
0
Fork 0
mirror of https://github.com/frida/tinycc synced 2024-11-28 10:33:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

x86-64-asm: Implement high %cr registers

Browse Source
This commit is contained in:
Michael Matz 2016-08-06 22:48:24 +02:00
parent 4e46c22d5c
commit 45b24c37a0
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
i386-asm.c
View File

@ -279,12 +279,17 @@ static inline int get_reg_shift(TCCState *s1)
} }
#ifdef TCC_TARGET_X86_64 #ifdef TCC_TARGET_X86_64
static int asm_parse_high_reg(int *type) static int asm_parse_numeric_reg(int *type)
{ {
int reg = -1; int reg = -1;
if (tok >= TOK_IDENT && tok < tok_ident) { if (tok >= TOK_IDENT && tok < tok_ident) {
const char *s = table_ident[tok - TOK_IDENT]->str; const char *s = table_ident[tok - TOK_IDENT]->str;
char c; char c;
*type = OP_REG64;
if (*s == 'c') {
s++;
*type = OP_CR;
}
if (*s++ != 'r') if (*s++ != 'r')
return -1; return -1;
/* Don't allow leading '0'. */ /* Don't allow leading '0'. */
@ -297,7 +302,9 @@ static int asm_parse_high_reg(int *type)
if (reg > 15) if (reg > 15)
return -1; return -1;
if ((c = *s) == 0) if ((c = *s) == 0)
*type = OP_REG64; ;
else if (*type != OP_REG64)
return -1;
else if (c == 'b' && !s[1]) else if (c == 'b' && !s[1])
*type = OP_REG8; *type = OP_REG8;
else if (c == 'w' && !s[1]) else if (c == 'w' && !s[1])
@ -328,7 +335,7 @@ static int asm_parse_reg(int *type)
} else if (tok == TOK_ASM_rip) { } else if (tok == TOK_ASM_rip) {
reg = -2; /* Probably should use different escape code. */ reg = -2; /* Probably should use different escape code. */
*type = OP_REG64; *type = OP_REG64;
} else if ((reg = asm_parse_high_reg(type)) >= 0 } else if ((reg = asm_parse_numeric_reg(type)) >= 0
&& (*type == OP_REG32 || *type == OP_REG64)) { && (*type == OP_REG32 || *type == OP_REG64)) {
; ;
#endif #endif
@ -393,7 +400,7 @@ static void parse_operand(TCCState *s1, Operand *op)
} else if (tok >= TOK_ASM_spl && tok <= TOK_ASM_dil) { } else if (tok >= TOK_ASM_spl && tok <= TOK_ASM_dil) {
op->type = OP_REG8 | OP_REG8_LOW; op->type = OP_REG8 | OP_REG8_LOW;
op->reg = 4 + tok - TOK_ASM_spl; op->reg = 4 + tok - TOK_ASM_spl;
} else if ((op->reg = asm_parse_high_reg(&op->type)) >= 0) { } else if ((op->reg = asm_parse_numeric_reg(&op->type)) >= 0) {
; ;
#endif #endif
} else { } else {

2
tests/asmtest.S
View File

@ -72,6 +72,8 @@ mov %rcx, %cr3
movq %cr3, %rax movq %cr3, %rax
movq %db3, %rbx movq %db3, %rbx
movq %dr6, %rax movq %dr6, %rax
mov %cr8, %rsi
mov %rdi, %cr8
#endif #endif
movl %fs, %ecx movl %fs, %ecx
movl %ebx, %fs movl %ebx, %fs