Mercurial > hg > tinycc
changeset 572:9414324cc68a
Rename g() to gen_byte(). Much easier to grep for, and a step towards making
the code generator consistently use a gen_ prefix for its functions.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sun, 16 Mar 2008 16:50:28 -0500 |
parents | 45bdc3a391df |
children | 09b424940c88 |
files | i386/asm.c i386/gen.c tccasm.c |
diffstat | 3 files changed, 41 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/i386/asm.c Sun Mar 16 16:49:37 2008 -0500 +++ b/i386/asm.c Sun Mar 16 16:50:28 2008 -0500 @@ -356,8 +356,8 @@ static void gen_le16(int v) { - g(v); - g(v >> 8); + gen_byte(v); + gen_byte(v >> 8); } /* generate the modrm operand */ @@ -366,10 +366,10 @@ int mod, reg1, reg2, sib_reg1; if (op->type & (OP_REG | OP_MMX | OP_SSE)) { - g(0xc0 + (reg << 3) + op->reg); + gen_byte(0xc0 + (reg << 3) + op->reg); } else if (op->reg == -1 && op->reg2 == -1) { /* displacement only */ - g(0x05 + (reg << 3)); + gen_byte(0x05 + (reg << 3)); gen_expr32(&op->e); } else { sib_reg1 = op->reg; @@ -388,18 +388,18 @@ reg1 = op->reg; if (op->reg2 != -1) reg1 = 4; - g(mod + (reg << 3) + reg1); + gen_byte(mod + (reg << 3) + reg1); if (reg1 == 4) { /* add sib byte */ reg2 = op->reg2; if (reg2 == -1) reg2 = 4; /* indicate no index */ - g((op->shift << 6) + (reg2 << 3) + sib_reg1); + gen_byte((op->shift << 6) + (reg2 << 3) + sib_reg1); } /* add offset */ if (mod == 0x40) { - g(op->e.v); + gen_byte(op->e.v); } else if (mod == 0x80 || op->reg == -1) { gen_expr32(&op->e); } @@ -518,8 +518,8 @@ int b; b = op0_codes[opcode - TOK_ASM_pusha]; if (b & 0xff00) - g(b >> 8); - g(b); + gen_byte(b >> 8); + gen_byte(b); return; } else { error("unknown opcode '%s'", @@ -544,14 +544,14 @@ /* generate data16 prefix if needed */ ss = s; if (s == 1 || (pa->instr_type & OPC_D16)) - g(WORD_PREFIX_OPCODE); + gen_byte(WORD_PREFIX_OPCODE); else if (s == 2) s = 1; /* now generates the operation */ if (pa->instr_type & OPC_FWAIT) - g(0x9b); + gen_byte(0x9b); if (has_seg_prefix) - g(segment_prefixes[seg_prefix.reg]); + gen_byte(segment_prefixes[seg_prefix.reg]); v = pa->opcode; if (v == 0x69 || v == 0x69) { @@ -622,8 +622,8 @@ } op1 = v >> 8; if (op1) - g(op1); - g(v); + gen_byte(op1); + gen_byte(v); /* search which operand will used for modrm */ modrm_index = 0; @@ -693,7 +693,7 @@ if (v & (OP_IM8 | OP_IM8S)) { if (ops[i].e.sym) goto error_relocate; - g(ops[i].e.v); + gen_byte(ops[i].e.v); } else if (v & OP_IM16) { if (ops[i].e.sym) { error_relocate: @@ -703,7 +703,7 @@ } else { if (pa->instr_type & (OPC_JMP | OPC_SHORTJMP)) { if (is_short_jmp) - g(ops[i].e.v); + gen_byte(ops[i].e.v); else gen_disp32(&ops[i].e); } else { @@ -1114,7 +1114,7 @@ for(i = 0; i < NB_SAVED_REGS; i++) { reg = reg_saved[i]; if (regs_allocated[reg]) - g(0x50 + reg); + gen_byte(0x50 + reg); } /* generate load code */ @@ -1171,7 +1171,7 @@ for(i = NB_SAVED_REGS - 1; i >= 0; i--) { reg = reg_saved[i]; if (regs_allocated[reg]) - g(0x58 + reg); + gen_byte(0x58 + reg); } } }
--- a/i386/gen.c Sun Mar 16 16:49:37 2008 -0500 +++ b/i386/gen.c Sun Mar 16 16:50:28 2008 -0500 @@ -78,7 +78,7 @@ static int func_ret_sub; /* XXX: make it faster ? */ -void g(int c) +void gen_byte(int c) { int ind1; @@ -93,17 +93,17 @@ void o(unsigned int c) { while (c) { - g(c); + gen_byte(c); c = c >> 8; } } void gen_le32(int c) { - g(c); - g(c >> 8); - g(c >> 16); - g(c >> 24); + gen_byte(c); + gen_byte(c >> 8); + gen_byte(c >> 16); + gen_byte(c >> 24); } /* output a symbol and patch all calls to it */ @@ -166,12 +166,12 @@ if (c == (char)c) { /* short reference */ o(0x45 | op_reg); - g(c); + gen_byte(c); } else { oad(0x85 | op_reg, c); } } else { - g(0x00 | op_reg | (r & VT_VALMASK)); + gen_byte(0x00 | op_reg | (r & VT_VALMASK)); } } @@ -282,7 +282,7 @@ { if (val == (char)val) { o(0xc483); - g(val); + gen_byte(val); } else { oad(0xc481, val); /* add $xxx, %esp */ } @@ -352,8 +352,8 @@ o(0x7cdb); else o(0x5cd9 + size - 4); /* fstp[s|l] 0(%esp) */ - g(0x24); - g(0x00); + gen_byte(0x24); + gen_byte(0x00); args_size += size; } else { /* simple type (currently always same size) */ @@ -518,8 +518,8 @@ o(0xc3); /* ret */ } else { o(0xc2); /* ret n */ - g(func_ret_sub); - g(func_ret_sub >> 8); + gen_byte(func_ret_sub); + gen_byte(func_ret_sub >> 8); } /* align local size to word & save local variables */ @@ -553,8 +553,8 @@ int r; r = a - ind - 2; if (r == (char)r) { - g(0xeb); - g(r); + gen_byte(0xeb); + gen_byte(r); } else { oad(0xe9, a - ind - 5); } @@ -568,7 +568,7 @@ v = vtop->r & VT_VALMASK; if (v == VT_CMP) { /* fast case : can jump directly since flags are set */ - g(0x0f); + gen_byte(0x0f); t = psym((vtop->c.i - 16) ^ inv, t); } else if (v == VT_JMP || v == VT_JMPI) { /* && or || optimization */ @@ -597,7 +597,7 @@ v = gv(RC_INT); o(0x85); o(0xc0 + v * 9); - g(0x0f); + gen_byte(0x0f); t = psym(0x85 ^ inv, t); } } @@ -625,7 +625,7 @@ /* XXX: generate inc and dec for smaller code ? */ o(0x83); o(0xc0 | (opc << 3) | r); - g(c); + gen_byte(c); } else { o(0x81); oad(0xc0 | (opc << 3) | r, c); @@ -688,7 +688,7 @@ c = vtop->c.i & 0x1f; o(0xc1); /* shl/shr/sar $xxx, r */ o(opc | r); - g(c); + gen_byte(c); } else { /* we generate the shift in ecx */ gv2(RC_INT, RC_ECX); @@ -867,7 +867,7 @@ (VT_INT | VT_UNSIGNED)) { /* unsigned int to float/double/long double */ o(0x6a); /* push $0 */ - g(0x00); + gen_byte(0x00); o(0x50 + (vtop->r & VT_VALMASK)); /* push r */ o(0x242cdf); /* fildll (%esp) */ o(0x08c483); /* add $8, %esp */
--- a/tccasm.c Sun Mar 16 16:49:37 2008 -0500 +++ b/tccasm.c Sun Mar 16 16:50:28 2008 -0500 @@ -396,7 +396,7 @@ if (e.sym) expect("constant"); if (size == 1) - g(e.v); + gen_byte(e.v); else gen_le16(e.v); } @@ -445,7 +445,7 @@ repeat_buf[7] = 0; for(i = 0; i < repeat; i++) { for(j = 0; j < size; j++) { - g(repeat_buf[j]); + gen_byte(repeat_buf[j]); } } } @@ -495,7 +495,7 @@ if (t == TOK_ASM_ascii && size > 0) size--; for(i = 0; i < size; i++) - g(p[i]); + gen_byte(p[i]); next(); if (tok == ',') { next();