From 60770eb2f40673b1fe86e8585fbdafeb68cdd640 Mon Sep 17 00:00:00 2001 From: otya128 Date: Tue, 23 Feb 2016 21:55:54 +0900 Subject: [PATCH] c --- SMILEBASIC/VM.d | 6 +++--- SMILEBASIC/compiler.d | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SMILEBASIC/VM.d b/SMILEBASIC/VM.d index cb03310..d8988f3 100644 --- a/SMILEBASIC/VM.d +++ b/SMILEBASIC/VM.d @@ -11,7 +11,7 @@ import std.conv; import std.stdio; struct VMVariable { - sizediff_t index; + int index; ValueType type; this(int index, ValueType type) { @@ -65,7 +65,7 @@ class VM currentSlot = slots[slot]; this.slot = slot; } - void directSlot(int start, Code[] code, sizediff_t len, VMVariable[wstring] globalTable, Function[wstring] functions, DataTable gdt/*GNU Debugging Tools*/, + void directSlot(int start, Code[] code, int len, VMVariable[wstring] globalTable, Function[wstring] functions, DataTable gdt/*GNU Debugging Tools*/, int[wstring] globalLabel, DebugInfo dinfo) { this.pc = start; @@ -82,7 +82,7 @@ class VM c.global[v.index] = Value(v.type); } } - void loadSlot(int slot, Code[] code, sizediff_t len, VMVariable[wstring] globalTable, Function[wstring] functions, DataTable gdt/*GNU Debugging Tools*/, + void loadSlot(int slot, Code[] code, int len, VMVariable[wstring] globalTable, Function[wstring] functions, DataTable gdt/*GNU Debugging Tools*/, int[wstring] globalLabel, DebugInfo dinfo) { auto s = this.slots[slot]; diff --git a/SMILEBASIC/compiler.d b/SMILEBASIC/compiler.d index d13d2fc..0e5ff66 100644 --- a/SMILEBASIC/compiler.d +++ b/SMILEBASIC/compiler.d @@ -221,7 +221,7 @@ class Compiler VMVariable[wstring] global; int[wstring] globalLabel; Function[wstring] functions; - sizediff_t globalIndex = 0; + int globalIndex = 0; void genCode(Code c) { code ~= c; @@ -1062,7 +1062,7 @@ class Compiler global = vm.currentSlot.globalTable; auto start = vm.currentSlot.code.length; this.code = vm.currentSlot.code; - globalIndex = vm.currentSlot.global.length; + globalIndex = cast(int)vm.currentSlot.global.length; functions = vm.currentSlot.functions; compileProgram(); vm.directSlot(start, code, globalIndex + 1, global, functions, globalScope.data, globalLabel, debugInfo);