d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug fix for commit 553242c18a.

Browse source 
In gtst, vtop->c.i is not usually zero, but it is when compiling:

int f(void) { return 1 && 1 ? 1 : 1; }
This commit is contained in:
Edmund Grimley Evans 2015-11-20 23:17:24 +00:00
parent 8dd1859176
commit 4ae626451e
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
i386-gen.c
View file

@ -678,12 +678,14 @@ ST_FUNC int gtst(int inv, int t)
} else if (v == VT_JMP || v == VT_JMPI) { } else if (v == VT_JMP || v == VT_JMPI) {
/* && or || optimization */ /* && or || optimization */
if ((v & 1) == inv) { if ((v & 1) == inv) {
uint32_t n1, n = vtop->c.i;
/* insert vtop->c jump list in t */ /* insert vtop->c jump list in t */
uint32_t n1, n = vtop->c.i;
if (n) {
while ((n1 = read32le(cur_text_section->data + n))) while ((n1 = read32le(cur_text_section->data + n)))
n = n1; n = n1;
write32le(cur_text_section->data + n, t); write32le(cur_text_section->data + n, t);
t = vtop->c.i; t = vtop->c.i;
}
} else { } else {
t = gjmp(t); t = gjmp(t);
gsym(vtop->c.i); gsym(vtop->c.i);

4
x86_64-gen.c
View file

@ -1716,12 +1716,14 @@ int gtst(int inv, int t)
} else if (v == VT_JMP || v == VT_JMPI) { } else if (v == VT_JMP || v == VT_JMPI) {
/* && or || optimization */ /* && or || optimization */
if ((v & 1) == inv) { if ((v & 1) == inv) {
uint32_t n1, n = vtop->c.i;
/* insert vtop->c jump list in t */ /* insert vtop->c jump list in t */
uint32_t n1, n = vtop->c.i;
if (n) {
while ((n1 = read32le(cur_text_section->data + n))) while ((n1 = read32le(cur_text_section->data + n)))
n = n1; n = n1;
write32le(cur_text_section->data + n, t); write32le(cur_text_section->data + n, t);
t = vtop->c.i; t = vtop->c.i;
}
} else { } else {
t = gjmp(t); t = gjmp(t);
gsym(vtop->c.i); gsym(vtop->c.i);