meesbs
/
tinycc
forked from Mirrors/tinycc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86_64-asm: fix copy-out registers 

If the destination is an indirect pointer access (which ends up
as VT_LLOCAL) the intermediate pointer must be loaded as VT_PTR,
not as whatever the pointed to type is.
master
Michael Matz 2016-10-03 05:34:01 +02:00
parent ad723a419f
commit 0bca6cab06
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i386-asm.c
View File

@ -1605,8 +1605,10 @@ ST_FUNC void asm_gen_code(ASMOperand *operands, int nb_operands,
SValue sv; SValue sv;
sv = *op->vt; sv = *op->vt;
sv.r = (sv.r & ~VT_VALMASK) | VT_LOCAL; sv.r = (sv.r & ~VT_VALMASK) | VT_LOCAL;
sv.type.t = VT_PTR;
load(out_reg, &sv); load(out_reg, &sv);
sv = *op->vt;
sv.r = (sv.r & ~VT_VALMASK) | out_reg; sv.r = (sv.r & ~VT_VALMASK) | out_reg;
store(op->reg, &sv); store(op->reg, &sv);
} }

10
tests/tcctest.c
View File

@ -2909,10 +2909,15 @@ char * get_asm_string (void)
unsigned int set; unsigned int set;
void fancy_copy (unsigned *in, unsigned *out)
{
asm volatile ("" : "=r" (*out) : "0" (*in));
}
void asm_test(void) void asm_test(void)
{ {
char buf[128]; char buf[128];
unsigned int val; unsigned int val, val2;
struct struct123 s1; struct struct123 s1;
struct struct1231 s2 = { (unsigned long)&s1 }; struct struct1231 s2 = { (unsigned long)&s1 };
/* Hide the outer base_func, but check later that the inline /* Hide the outer base_func, but check later that the inline
@ -2979,6 +2984,9 @@ void asm_test(void)
printf("asmbool: failed\n"); printf("asmbool: failed\n");
#endif #endif
printf("asmstr: %s\n", get_asm_string()); printf("asmstr: %s\n", get_asm_string());
val = 43;
fancy_copy (&val, &val2);
printf ("fancycpy(%d)=%d\n", val, val2);
return; return;
label1: label1:
goto label2; goto label2;