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

Add lea instruction. Fix dependency issues.

Browse source 
--HG--
branch : dtrg-videocore
This commit is contained in:
David Given 2013-05-20 19:56:33 +01:00
parent 11890026db
commit 5082b2a5d7
6 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mach/proto/as/build.mk
View file

@ -26,7 +26,9 @@ define build-as-impl
$(eval CLEANABLES += $(OBJDIR)/$D/preprocessed-comm2.y)
$(OBJDIR)/$D/preprocessed-comm2.y: mach/proto/as/comm2.y $(CPPANSI) \
mach/$(ARCH)/as/mach1.c \
mach/$(ARCH)/as/mach2.c \
mach/$(ARCH)/as/mach3.c \
mach/$(ARCH)/as/mach4.c
@echo PREPROCESS $$@
@mkdir -p $$(dir $$@)

2
mach/vc4/as/mach1.c
View file

@ -23,3 +23,5 @@ extern void branch_addcmp_reg_reg_instr(int cc, int rd, int ra, int rs, struct e
extern void branch_addcmp_lit_reg_instr(int cc, int rd, long va, int rs, struct expr_t* expr);
extern void branch_addcmp_reg_lit_instr(int cc, int rd, int ra, long vs, struct expr_t* expr);
extern void branch_addcmp_lit_lit_instr(int cc, int rd, long va, long vs, struct expr_t* expr);
extern void lea_stack_instr(int rd, long va, int rs);
extern void lea_address_instr(int rd, struct expr_t* expr);

1
mach/vc4/as/mach2.c
View file

@ -18,5 +18,6 @@
%token <y_word> OP_MISC
%token <y_word> OP_MISCL
%token <y_word> OP_STACK
%token <y_word> OP_LEA

1
mach/vc4/as/mach3.c
View file

@ -145,3 +145,4 @@
0, OP_MEM, B8(00000110), "ldhs",
0, OP_MEM, B8(00000111), "sths",
0, OP_LEA, 0, "lea",

3
mach/vc4/as/mach4.c
View file

@ -71,5 +71,8 @@ operation
| OP_MEM CC GPR ',' '(' GPR ')' '+' '+' { mem_postincr_instr($1, $2, $3, $6); }
| OP_MEM GPR ',' expr { mem_address_instr($1, $2, &$4); }
| OP_LEA GPR ',' absexp '(' GPR ')' { lea_stack_instr($2, $4, $6); }
| OP_LEA GPR ',' expr { lea_address_instr($2, &$4); }
;

23
mach/vc4/as/mach5.c
View file

@ -475,3 +475,26 @@ void branch_addcmp_lit_lit_instr(int cc, int rd, long va, long vs, struct expr_t
branch_addcmp_common(B16(11000000,00000000) | (vs<<8), 8, expr);
}
/* lea, where the source is relative to the stack. */
void lea_stack_instr(int rd, long va, int rs)
{
if (rs != 25)
serror("source register must be sp");
if (!fitx(va, 6))
serror("offset too big to encode in instruction");
va = maskx(va, 6);
emit2(B16(00010000,00000000) | (rd<<0) | (va<<5));
}
/* lea, where the source is an address. */
void lea_address_instr(int rd, struct expr_t* expr)
{
newrelo(expr->typ, RELOVC4);
emit2(B16(11100101,00000000) | (rd<<0));
emit4(expr->val);
}