add import feature

assert.c

@@ -232,10 +232,10 @@ assertexpr(Node *n)
 	case Ocall:
 		assertexpr(r);
 		t = l->ty;
+		n->ty = t->tof;
 		if(l->op==Opkg)
 			return;
 		usetype(t);
-		n->ty = t->tof;
 		break;
 	default:
 		assert(0);

exports.c

@@ -93,12 +93,14 @@ void
 genbin(char *name)
 {
 	f = fopen(name, "w+");
-	// fprintf(f, "%s\n", pkgname->name);
+	wr4(f, nimport);
-	// fprintf(f, "%d\n", nimport);
+	for(int i = 0; i < nimport; ++i){
-	// for(int i = 0; i < nimport; ++i){
+		char buf[1024];
-	// 	fprintf(f, "%d %s %s\n", i, imports[i].path->name, imports[i].sym->name);
+		sprintf(buf, "%s/obj", imports[i].path->name);
-	// }
+		int len = strlen(buf);
-
+		wr4(f, len);
+		fwrite(buf, 1, len, f);
+	}
 	wr4(f, ninst);
 	disinst(f, firstinst);
 	fclose(f);

parse.c

@@ -827,7 +827,6 @@ imret(int n)
 	if(n == 0)
 		return tnone;
 	if(n == 1){
-		want((int[]){Lconst,0});
 		want((int[]){Lconst,0});
 		return imtype();
 	}

test/fib/exported

@@ -0,0 +1,7 @@
+fib
+fn .fib 160 0 1 1
+	0
+	int 1 8 56
+	8
+	int 1 8 0
+

test/fib/fib.yo

@@ -0,0 +1,8 @@
+package fib
+
+export fn fib(n int) int {
+	if n <= 1 {
+		return n;
+	};
+	return fib(n-1) + fib(n-2);
+};

test/main.yo

@@ -0,0 +1,10 @@
+package main
+
+import "./test/fib"
+import "./test/nqueen"
+
+fn main() int {
+	f := fib.fib(10);
+	n := nqueen.solve(8);
+	return f + n;
+};

test/nqueen/exported

@@ -0,0 +1,7 @@
+nqueen
+fn .solve 296 0 1 1
+	0
+	int 1 8 56
+	8
+	int 1 8 0
+

test/nqueen/nqueen.yo

@@ -1,20 +1,8 @@
-package main
+package nqueen
 
-type Any struct {
+export fn solve(n int) int {
-	x,y int;
+	arr := [16]int{};
-	arr [8]int;
+	return nqueen(0, 0, arr[:n]);
-};
-
-fn main() int {
-	arr := [8]int{};
-	return nqueen(0, 0, arr[:]);
-};
-
-fn fib(n int) int{
-	if n <= 1 {
-		return n;
-	};
-	return fib(n-1) + fib(n-2);
 };
 
 fn nqueen(r,ans int, arr []int) int {

vm/vm.c

@@ -5,6 +5,10 @@ u32 ninst;
 Inst *inst;
 REG R;
 
+Inst **modules;
+u32 *modsizes;
+int nmodules;
+
 #define OP(fn)	void fn(void)
 #define B(r)	*((i8*)(R.r))
 #define F(r)	((WORD*)(R.r))
@@ -112,6 +116,18 @@ OP(call){
 	R.FP = (u8*)f;
 	JMP(d);
 }
+OP(pcall){
+	Frame *f;
+	int mod, pc;
+
+	f = T(s);
+	f->lr = R.PC;
+	f->fp = R.FP;
+	R.FP = (u8*)f;
+	mod = W(m);
+	pc = W(d);
+	R.PC = &modules[mod][pc];
+}
 OP(ret) {
 	Frame *f = (Frame*)R.FP;
 	R.FP = f->fp;
@@ -165,6 +181,7 @@ static void (*optab[])(void) = {
 	[ILEA] = lea,
 	[IFRAME] = frame,
 	[ICALL] = call,
+	[PCALL] = pcall,
 	[IJMP] = jmp,
 	[IRET] = ret,
 	[ILEN] = len,
@@ -204,15 +221,15 @@ xec(void)
 }
 
 void
-bpatch(Inst *i)
+bpatch(Inst *i, Inst *base, u32 n)
 {
 	static int tab[IEND] = {
 		[ICALL]=1,[IBEQW]=1,[IBNEQW]=1,[IJMP]=1,
 	};
 	if(tab[i->op] == 0)
 		return;
-	assert(i->d.imm >= 0 && i->d.imm < ninst);	
+	assert(i->d.imm >= 0 && i->d.imm < n);
-	i->d.imm = (WORD)&inst[i->d.imm];	
+	i->d.imm = (WORD)&base[i->d.imm];
 	return;
 }
 
@@ -248,7 +265,6 @@ rdinst(FILE *f, Inst *in)
 		break;
 	case DST(AIMM):
 		in->d.ind = rd4(f);
-		bpatch(in);
 		break;
 	case DST(AIND|AFP):
 	case DST(AIND|AMP):
@@ -258,18 +274,53 @@ rdinst(FILE *f, Inst *in)
 	}
 }
 
+Inst*
+loadmod(char *fname, u32 *outn)
+{
+	FILE *f = fopen(fname, "r");
+	assert(f != 0);
+	u32 nim = rd4(f);
+	for(u32 i = 0; i < nim; i++){
+		u32 len = rd4(f);
+		fseek(f, len, SEEK_CUR);
+	}
+	u32 n = rd4(f);
+	Inst *ins = calloc(sizeof(Inst), n);
+	for(u32 i = 0; i < n; i++)
+		rdinst(f, ins+i);
+	for(u32 i = 0; i < n; i++)
+		bpatch(ins+i, ins, n);
+	fclose(f);
+	*outn = n;
+	return ins;
+}
+
 void
 load(char *fname)
 {
 	FILE *f = fopen(fname, "r");
 	assert(f != 0);
 	initprog(1024);
+
+	nmodules = rd4(f);
+	if(nmodules > 0){
+		modules = calloc(sizeof(Inst*), nmodules);
+		modsizes = calloc(sizeof(u32), nmodules);
+		for(int i = 0; i < nmodules; i++){
+			u32 len = rd4(f);
+			char *path = calloc(1, len+1);
+			fread(path, 1, len, f);
+			modules[i] = loadmod(path, &modsizes[i]);
+			free(path);
+		}
+	}
+
 	ninst = rd4(f);
 	inst = calloc(sizeof(Inst), ninst);
-
+	for(u32 i = 0; i < ninst; i++)
-	for(u32 i = 0; i < ninst; ++i){
 		rdinst(f, inst+i);
-	}
+	for(u32 i = 0; i < ninst; i++)
+		bpatch(inst+i, inst, ninst);
 	R.PC = inst;
 	fclose(f);
 }