bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Add execReturnAddress

Browse Source
This commit is contained in:
otya128
2016-12-27 15:06:24 +09:00
parent eccbb6b9f5
commit caa2895e37
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SMILEBASIC/VM.d
View File

@@ -49,6 +49,8 @@ class VMSlot
int[wstring] globalLabel; int[wstring] globalLabel;
DebugInfo debugInfo; DebugInfo debugInfo;
Value[wstring] directModeVariable; Value[wstring] directModeVariable;
bool hasExecReturnAddress;
VMAddress execReturnAddress;
} }
class VM class VM
{ {
@@ -112,6 +114,7 @@ class VM
} }
} }
auto s = this.slots[slot]; auto s = this.slots[slot];
s.hasExecReturnAddress = false;
s.isUsed = true; s.isUsed = true;
s.code = code; s.code = code;
s.global = new Value[len]; s.global = new Value[len];
@@ -260,7 +263,14 @@ class VM
} }
void end() void end()
{ {
pc = cast(int)currentSlot.code.length; if (currentSlot.hasExecReturnAddress)
{
currentSlot.hasExecReturnAddress = false;
pc = currentSlot.execReturnAddress.address;
setCurrentSlot(currentSlot.execReturnAddress.slot);
}
else
pc = cast(int)currentSlot.code.length;
} }
void dump() void dump()
{ {
@@ -2306,7 +2316,7 @@ class Exec : Code
if (arg.isString) if (arg.isString)
{ {
auto file = Projects.parseFileName(arg.castDString); auto file = Projects.parseFileName(arg.castDString);
if (file.resource != Resource.program && file.resource == Resource.none) if (file.resource != Resource.program && file.resource != Resource.none)
{ {
throw new IllegalFunctionCall(); throw new IllegalFunctionCall();
} }
@@ -2339,7 +2349,17 @@ class Exec : Code
import otya.smilebasic.parser; import otya.smilebasic.parser;
auto parser = new Parser(cast(immutable)vm.petitcomputer.slot[slot].text); auto parser = new Parser(cast(immutable)vm.petitcomputer.slot[slot].text);
auto compiler = parser.compiler; auto compiler = parser.compiler;
VMAddress retaddr;
if (slot != vm.currentSlotNumber)
{
retaddr = VMAddress(cast(byte)vm.currentSlotNumber, vm.pc);
}
compiler.compile(vm, slot); compiler.compile(vm, slot);
if (slot != vm.currentSlotNumber)
{
vm.slots[slot].execReturnAddress = retaddr;
vm.slots[slot].hasExecReturnAddress = true;
}
vm.setCurrentSlot(slot); vm.setCurrentSlot(slot);
vm.pc = 0 - 1; vm.pc = 0 - 1;
} }