changeset 30:5942da44c289

Bugs: CbCGcc do normal call in goto codesegment
author anatofuz
date Sun, 04 Nov 2018 11:26:11 +0900
parents 72b2a81d544f
children 41c54aba8613
files CbCMakefile src/core/cbc-interp.cbc
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/CbCMakefile	Sun Nov 04 10:50:17 2018 +0900
+++ b/CbCMakefile	Sun Nov 04 11:26:11 2018 +0900
@@ -1,3 +1,4 @@
+# This makefile is dedicated to CbCgcc
 CC     = ${CBC_COMPILER}
 LD     = ${CBC_COMPILER}
 AR     = ar
@@ -622,11 +623,11 @@
 
 .cbc.i:
 	$(MSG) pre-processing $@
-	$(CMD)$(CC) -E $(CFLAGS) -DMVM_BUILD_SHARED -fPIC $(CINCLUDES) > $@ $*.c
+	$(CMD)$(CC) -E $(CFLAGS) -DMVM_BUILD_SHARED -fPIC $(CINCLUDES) > $@ $*.cbc
 
 .cbc.s:
 	$(MSG) generating assembler for $@
-	$(CMD)$(CC) -S $(CFLAGS) -DMVM_BUILD_SHARED -fPIC $(CINCLUDES) -o $@ $*.c
+	$(CMD)$(CC) -S $(CFLAGS) -DMVM_BUILD_SHARED -fPIC $(CINCLUDES) -o $@ $*.cbc
 
 
 .cbc.o:
--- a/src/core/cbc-interp.cbc	Sun Nov 04 10:50:17 2018 +0900
+++ b/src/core/cbc-interp.cbc	Sun Nov 04 11:26:11 2018 +0900
@@ -6446,11 +6446,11 @@
     goto cbc_next(i);
 }
 
-/*
+
 void MVM_interp_run1(INTERP i){
 	goto (CODES[(i->op = *(MVMuint16 *)(i->cur_op), i->cur_op += 2, i->op)])(i);
 }
-*/
+
 
 /* This is the interpreter run loop. We have one of these per thread. */
 void MVM_interp_run(MVMThreadContext *tc, void (*initial_invoke)(MVMThreadContext *, void *), void *invoke_data) {
@@ -6494,8 +6494,8 @@
         /* The ops should be in the same order here as in the oplist file, so
          * the compiler can can optimise the switch properly */
         //DISPATCH(NEXT_OP(i))
-	goto (CODES[(i->op = *(MVMuint16 *)(i->cur_op), i->cur_op += 2, i->op)])(i);
-	//MVM_interp_run1(i);
+	//goto (CODES[(i->op = *(MVMuint16 *)(i->cur_op), i->cur_op += 2, i->op)])(i);
+	MVM_interp_run1(i);
     }
 
 }