d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove type quad, use type word_t in PowerPC as.

Browse source 
Type word_t is for encoding the machine instructions.  It only needs
32 bits for PowerPC.  It was long (which can have 32 or 64 bits), and
there was a second type quad (which was uint32_t).  Switch word_t to
uint32_t and replace quad with word_t.

Also change valu_t and ADDR_T away from long.
This commit is contained in:
George Koehler 2017-01-30 16:15:02 -05:00
parent 48e3aab728
commit 3c1d2d79f0
4 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mach/powerpc/as/mach0.c
View file

@ -11,15 +11,13 @@
#define DEBUG 0 #define DEBUG 0
#undef valu_t #undef valu_t
#define valu_t long #define valu_t int32_t
#undef ADDR_T #undef ADDR_T
#define ADDR_T long #define ADDR_T uint32_t
#undef word_t #undef word_t
#define word_t long #define word_t uint32_t
typedef uint32_t quad;
#undef ALIGNWORD #undef ALIGNWORD
#define ALIGNWORD 4 #define ALIGNWORD 4

4
mach/powerpc/as/mach1.c
View file

@ -5,5 +5,5 @@
#include <stdbool.h> #include <stdbool.h>
extern quad emit_hi(struct expr_t* expr, bool is_signed); extern word_t emit_hi(struct expr_t* expr, bool is_signed);
extern quad emit_lo(struct expr_t* expr); extern word_t emit_lo(struct expr_t* expr);

46
mach/powerpc/as/mach4.c
View file

@ -94,7 +94,7 @@ operation
| OP_LI32 li32 /* emitted in subrule */ | OP_LI32 li32 /* emitted in subrule */
| OP_clrlsldi c GPR ',' GPR ',' u6 ',' u6 | OP_clrlsldi c GPR ',' GPR ',' u6 ',' u6
{ {
quad mb = ($7 - $9) & 0x3f; word_t mb = ($7 - $9) & 0x3f;
fit($9 <= $7); fit($9 <= $7);
emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6($9) | MB6(mb)); emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6($9) | MB6(mb));
} }
@ -104,41 +104,41 @@ operation
} }
| OP_clrrdi c GPR ',' GPR ',' u6 | OP_clrrdi c GPR ',' GPR ',' u6
{ {
quad me = 63 - $7; word_t me = 63 - $7;
emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6(0) | MB6(me)); emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6(0) | MB6(me));
} }
| OP_extldi c GPR ',' GPR ',' u6 ',' u6 | OP_extldi c GPR ',' GPR ',' u6 ',' u6
{ {
quad me = ($7 - 1) & 0x3f; word_t me = ($7 - 1) & 0x3f;
fit($7 > 0); fit($7 > 0);
emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6($9) | MB6(me)); emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6($9) | MB6(me));
} }
| OP_extrdi c GPR ',' GPR ',' u6 ',' u6 | OP_extrdi c GPR ',' GPR ',' u6 ',' u6
{ {
quad sh = ($9 + $7) & 0x3f; word_t sh = ($9 + $7) & 0x3f;
quad mb = (64 - $7) & 0x3f; word_t mb = (64 - $7) & 0x3f;
fit($7 > 0); fit($7 > 0);
emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6(sh) | MB6(mb)); emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6(sh) | MB6(mb));
} }
| OP_rotrdi c GPR ',' GPR ',' u6 | OP_rotrdi c GPR ',' GPR ',' u6
{ {
quad sh = (64 - $7) & 0x3f; word_t sh = (64 - $7) & 0x3f;
emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6(sh) | MB6(0)); emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6(sh) | MB6(0));
} }
| OP_sldi c GPR ',' GPR ',' u6 | OP_sldi c GPR ',' GPR ',' u6
{ {
quad me = 63 - $7; word_t me = 63 - $7;
emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6($7) | MB6(me)); emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6($7) | MB6(me));
} }
| OP_srdi c GPR ',' GPR ',' u6 | OP_srdi c GPR ',' GPR ',' u6
{ {
quad sh = (64 - $7) & 0x3f; word_t sh = (64 - $7) & 0x3f;
emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6(sh) | MB6($7)); emit4($1 | $2 | ($5<<21) | ($3<<16) | SH6(sh) | MB6($7));
} }
| OP_clrlslwi c GPR ',' GPR ',' u5 ',' u5 | OP_clrlslwi c GPR ',' GPR ',' u5 ',' u5
{ {
quad mb = ($7 - $9) & 0x1f; word_t mb = ($7 - $9) & 0x1f;
quad me = 31 - $9; word_t me = 31 - $9;
fit($9 <= $7); fit($9 <= $7);
emit4($1 | $2 | ($5<<21) | ($3<<16) | emit4($1 | $2 | ($5<<21) | ($3<<16) |
($9<<11) | (mb<<6) | (me<<1)); ($9<<11) | (mb<<6) | (me<<1));
@ -150,56 +150,56 @@ operation
} }
| OP_clrrwi c GPR ',' GPR ',' u5 | OP_clrrwi c GPR ',' GPR ',' u5
{ {
quad me = 31 - $7; word_t me = 31 - $7;
emit4($1 | $2 | ($5<<21) | ($3<<16) | emit4($1 | $2 | ($5<<21) | ($3<<16) |
(0<<11) | (0<<6) | (me<<1)); (0<<11) | (0<<6) | (me<<1));
} }
| OP_extlwi c GPR ',' GPR ',' u5 ',' u5 | OP_extlwi c GPR ',' GPR ',' u5 ',' u5
{ {
quad me = ($7 - 1) & 0x1f; word_t me = ($7 - 1) & 0x1f;
fit($7 > 0); fit($7 > 0);
emit4($1 | $2 | ($5<<21) | ($3<<16) | emit4($1 | $2 | ($5<<21) | ($3<<16) |
($9<<11) | (0<<6) | (me<<1)); ($9<<11) | (0<<6) | (me<<1));
} }
| OP_extrwi c GPR ',' GPR ',' u5 ',' u5 | OP_extrwi c GPR ',' GPR ',' u5 ',' u5
{ {
quad sh = ($9 + $7) & 0x1f; word_t sh = ($9 + $7) & 0x1f;
quad mb = (32 - $7) & 0x1f; word_t mb = (32 - $7) & 0x1f;
fit($7 > 0); fit($7 > 0);
emit4($1 | $2 | ($5<<21) | ($3<<16) | emit4($1 | $2 | ($5<<21) | ($3<<16) |
(sh<<11) | (mb<<6) | (31<<1)); (sh<<11) | (mb<<6) | (31<<1));
} }
| OP_inslwi c GPR ',' GPR ',' u5 ',' u5 | OP_inslwi c GPR ',' GPR ',' u5 ',' u5
{ {
quad sh = (32 - $9) & 0x1f; word_t sh = (32 - $9) & 0x1f;
quad me = ($9 + $7 - 1) & 0x1f; word_t me = ($9 + $7 - 1) & 0x1f;
fit($7 > 0); fit($7 > 0);
emit4($1 | $2 | ($5<<21) | ($3<<16) | emit4($1 | $2 | ($5<<21) | ($3<<16) |
(sh<<11) | ($9<<6) | (me<<1)); (sh<<11) | ($9<<6) | (me<<1));
} }
| OP_insrwi c GPR ',' GPR ',' u5 ',' u5 | OP_insrwi c GPR ',' GPR ',' u5 ',' u5
{ {
quad sh = (32 - $9 - $7) & 0x1f; word_t sh = (32 - $9 - $7) & 0x1f;
quad me = ($9 + $7 - 1) & 0x1f; word_t me = ($9 + $7 - 1) & 0x1f;
fit($7 > 0); fit($7 > 0);
emit4($1 | $2 | ($5<<21) | ($3<<16) | emit4($1 | $2 | ($5<<21) | ($3<<16) |
(sh<<11) | ($9<<6) | (me<<1)); (sh<<11) | ($9<<6) | (me<<1));
} }
| OP_rotrwi c GPR ',' GPR ',' u5 | OP_rotrwi c GPR ',' GPR ',' u5
{ {
quad sh = (32 - $7) & 0x1f; word_t sh = (32 - $7) & 0x1f;
emit4($1 | $2 | ($5<<21) | ($3<<16) | emit4($1 | $2 | ($5<<21) | ($3<<16) |
(sh<<11) | (0<<6) | (31<<1)); (sh<<11) | (0<<6) | (31<<1));
} }
| OP_slwi c GPR ',' GPR ',' u5 | OP_slwi c GPR ',' GPR ',' u5
{ {
quad me = 31 - $7; word_t me = 31 - $7;
emit4($1 | $2 | ($5<<21) | ($3<<16) | emit4($1 | $2 | ($5<<21) | ($3<<16) |
($7<<11) | (0<<6) | (me<<1)); ($7<<11) | (0<<6) | (me<<1));
} }
| OP_srwi c GPR ',' GPR ',' u5 | OP_srwi c GPR ',' GPR ',' u5
{ {
quad sh = (32 - $7) & 0x1f; word_t sh = (32 - $7) & 0x1f;
emit4($1 | $2 | ($5<<21) | ($3<<16) | emit4($1 | $2 | ($5<<21) | ($3<<16) |
(sh<<11) | ($7<<6) | (31<<1)); (sh<<11) | ($7<<6) | (31<<1));
} }
@ -367,8 +367,8 @@ bda
li32 li32
: GPR ',' expr : GPR ',' expr
{ {
quad type = $3.typ & S_TYP; word_t type = $3.typ & S_TYP;
quad val = $3.val; word_t val = $3.val;
if ((type == S_ABS) && (val <= 0xffff)) if ((type == S_ABS) && (val <= 0xffff))
emit4((14<<26) | ($1<<21) | (0<<16) | val); /* addi */ emit4((14<<26) | ($1<<21) | (0<<16) | val); /* addi */
else else

12
mach/powerpc/as/mach5.c
View file

@ -1,10 +1,10 @@
quad emit_hi(struct expr_t* expr, bool is_signed) word_t emit_hi(struct expr_t* expr, bool is_signed)
{ {
/* If this is a symbol reference, discard the symbol and keep only the /* If this is a symbol reference, discard the symbol and keep only the
* offset part. */ * offset part. */
quad type = expr->typ & S_TYP; word_t type = expr->typ & S_TYP;
quad val = expr->val; word_t val = expr->val;
uint16_t hi = val >> 16; uint16_t hi = val >> 16;
uint16_t lo = val & 0xffff; uint16_t lo = val & 0xffff;
@ -23,10 +23,10 @@ quad emit_hi(struct expr_t* expr, bool is_signed)
return hi; return hi;
} }
quad emit_lo(struct expr_t* expr) word_t emit_lo(struct expr_t* expr)
{ {
quad type = expr->typ & S_TYP; word_t type = expr->typ & S_TYP;
quad val = expr->val; word_t val = expr->val;
/* If the assembler stored a symbol for relocation later, we need to /* If the assembler stored a symbol for relocation later, we need to
* abandon it (because the relocation was generated by emit_ha). */ * abandon it (because the relocation was generated by emit_ha). */