Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'chambart/flambda_prereq-init_assign' into flambda_prereq-init_assign

master
Mark Shinwell 2016-01-12 17:06:13 +01:00
parent 029e1bbbbc f00807aace
commit f0f9627dc2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testsuite/tests/asmcomp/Makefile
View File

@ -27,7 +27,7 @@ OTHEROBJS=\
OBJS=parsecmmaux.cmo parsecmm.cmo lexcmm.cmo OBJS=parsecmmaux.cmo parsecmm.cmo lexcmm.cmo
ADD_COMPFLAGS=$(INCLUDES) -g ADD_COMPFLAGS=$(INCLUDES) -w -40 -g
default: default:
@if $(BYTECODE_ONLY) || [ -z "$(ASPP)" ]; then : ; else \ @if $(BYTECODE_ONLY) || [ -z "$(ASPP)" ]; then : ; else \

8
testsuite/tests/asmcomp/parsecmm.mly
View File

@ -210,11 +210,11 @@ expr:
| LPAREN FLOATAREF expr expr RPAREN | LPAREN FLOATAREF expr expr RPAREN
{ Cop(Cload Double_u, [access_array $3 $4 Arch.size_float]) } { Cop(Cload Double_u, [access_array $3 $4 Arch.size_float]) }
| LPAREN ADDRASET expr expr expr RPAREN | LPAREN ADDRASET expr expr expr RPAREN
{ Cop(Cstore Word_val, [access_array $3 $4 Arch.size_addr; $5]) } { Cop(Cstore (Word_val, Assignment), [access_array $3 $4 Arch.size_addr; $5]) }
| LPAREN INTASET expr expr expr RPAREN | LPAREN INTASET expr expr expr RPAREN
{ Cop(Cstore Word_int, [access_array $3 $4 Arch.size_int; $5]) } { Cop(Cstore (Word_int, Assignment), [access_array $3 $4 Arch.size_int; $5]) }
| LPAREN FLOATASET expr expr expr RPAREN | LPAREN FLOATASET expr expr expr RPAREN
{ Cop(Cstore Double_u, [access_array $3 $4 Arch.size_float; $5]) } { Cop(Cstore (Double_u, Assignment), [access_array $3 $4 Arch.size_float; $5]) }
; ;
exprlist: exprlist:
exprlist expr { $2 :: $1 } exprlist expr { $2 :: $1 }
@ -254,7 +254,7 @@ unaryop:
| ABSF { Cabsf } | ABSF { Cabsf }
; ;
binaryop: binaryop:
STORE chunk { Cstore $2 } STORE chunk { Cstore ($2, Assignment) }
| ADDI { Caddi } | ADDI { Caddi }
| SUBI { Csubi } | SUBI { Csubi }
| MULI { Cmuli } | MULI { Cmuli }