Changeset 22454

Timestamp:

11/01/08 00:02:06 (5 years ago)

Author:

fujidig

Message:

goto, gosub, exgoto, on を instruction 化。

Location:

lang/javascript/hsp-on-js/trunk/src

Files:

• builtin-funcs.js (modified) (2 diffs)
• compiler.js (modified) (3 diffs)
• evaluator.js (modified) (4 diffs)
• instruction.js (modified) (1 diff)

lang/javascript/hsp-on-js/trunk/src/builtin-funcs.js

@@ -7 +7 @@
 
 BuiltinFuncs[Token.Type.PROGCMD] = {
-        0x00: function goto_(label) {
-                this.scanArgs(arguments, 'l');
-                this.pc = label.toValue().pos - 1;
-        },
-        0x01: function gosub(label) {
-                this.scanArgs(arguments, 'l');
-                this.subroutineJump(label.toValue());
-        },
         0x07: function wait(n) {
                 this.scanArgs(arguments, 'N');
@@ -68 +60 @@
                 default:
                         throw new HSPError(ErrorCode.UNSUPPORTED_FUNCTION);
-                }
-        },
-        0x18: function exgoto(v, mode, b, label) {
-                this.scanArgs(arguments, 'vnnl');
-                this.scanArg(v, 'i');
-                var a = v.toIntValue()._value;
-                mode = mode.toIntValue()._value;
-                b = b.toIntValue()._value;
-                label = label.toValue();
-                if(mode >= 0) {
-                        if(a >= b) {
-                                this.pc = label.pos - 1;
-                        }
-                } else {
-                        if(a <= b) {
-                                this.pc = label.pos - 1;
-                        }
-                }
-        },
-        0x19: function on(n, jumpType) {
-                this.scanArgs(arguments, 'Njl*');
-                n = n ? n.toIntValue()._value : 0;
-                if(!(0 <= n && n < arguments.length - 2)) {
-                        return;
-                }
-                var label = arguments[n + 2].toValue();
-                if(jumpType == JumpType.GOTO) {
-                        this.pc = label.pos - 1;
-                } else {
-                        this.subroutineJump(label);
                 }
         }

lang/javascript/hsp-on-js/trunk/src/compiler.js

@@ -127 +127 @@
                                 this.tokensPos += 2;
                         } else {
-                                this.compileCommand(sequence);
+                                this.tokensPos ++;
+                                var argc = this.compileParameters(sequence);
+                                if(argc != 1) throw this.error('goto の引数の数が違います', token);
+                                this.pushNewInsn(sequence, Instruction.Code.GOTO_EXPR, [], token);
+                        }
+                        break;
+                case 0x01: // gosub
+                        var labelToken = this.ax.tokens[this.tokensPos + 1];
+                        if(labelToken && labelToken.type == Token.Type.LABEL && !labelToken.ex2 && (!this.ax.tokens[this.tokensPos + 2] || this.ax.tokens[this.tokensPos + 2].ex1)) {
+                                this.pushNewInsn(sequence, Instruction.Code.GOSUB,
+                                                 [this.labels[labelToken.code]]);
+                                this.tokensPos += 2;
+                        } else {
+                                this.tokensPos ++;
+                                var argc = this.compileParameters(sequence);
+                                if(argc != 1) throw this.error('gosub の引数の数が違います', token);
+                                this.pushNewInsn(sequence, Instruction.Code.GOSUB_EXPR, [], token);
                         }
                         break;
@@ -219 +235 @@
                         if(argc != 1) throw this.error('delmod の引数の数が違います', token);
                         this.pushNewInsn(sequence, Instruction.Code.DELMOD, [], token);
+                        break;
+                case 0x18: // exgoto
+                        this.tokensPos ++;
+                        // exgoto <添字指定のない静的変数>, p2, p3, <ラベルリテラル> を最適化
+                        var pos = this.tokensPos;
+                        var varToken = this.ax.tokens[pos];
+                        if(!varToken.ex1 && !varToken.ex2 &&
+                           varToken.type == Token.Type.VAR && this.ax.tokens[pos + 1].ex2) {
+                                pos ++;
+                                var secondParamPos = pos;
+                                pos += this.skipParameter(pos);
+                                var thirdParamPos = pos;
+                                pos += this.skipParameter(pos);
+                                var labelToken = this.ax.tokens[pos];
+                                if(labelToken && !labelToken.ex1 &&
+                                   labelToken.type == Token.Type.LABEL && this.ax.tokens[pos+1]) {
+                                        // p2 が整数リテラルの場合はさらに最適化
+                                        if(secondParamPos + 1 == thirdParamPos && this.ax.tokens[secondParamPos].type == Token.Type.INUM) {
+                                                this.tokensPos = thirdParamPos;
+                                                this.compileParameter(sequence);
+                                                if(this.ax.tokens[secondParamPos].code >= 0) {
+                                                        this.pushNewInsn(sequence, Instruction.Code.EXGOTO_OPT2,
+                                                                         [varToken.code, this.labels[labelToken.code]], token);
+                                                } else {
+                                                        this.pushNewInsn(sequence, Instruction.Code.EXGOTO_OPT3,
+                                                                         [varToken.code, this.labels[labelToken.code]], token);
+                                                }
+                                                this.tokensPos = pos + 1;
+                                                break;
+                                        }
+                                        this.tokensPos = secondParamPos;
+                                        this.compileParameter(sequence);
+                                        this.compileParameter(sequence);
+                                        this.pushNewInsn(sequence, Instruction.Code.EXGOTO_OPT1,
+                                                         [varToken.code, this.labels[labelToken.code]], token);
+                                        this.tokensPos = pos + 1;
+                                        break;
+                                }
+                        }
+                        var argc = this.compileParameters(sequence);
+                        if(argc != 4) throw this.error('exgoto の引数の数が違います', token);
+                        this.pushNewInsn(sequence, Instruction.Code.EXGOTO, [], token);
+                        break;
+                case 0x19: // on
+                        this.tokensPos ++;
+                        var paramToken = this.ax.tokens[this.tokensPos];
+                        if(paramToken.ex1 || paramToken.ex2) {
+                                throw this.error('パラメータは省略できません', token);
+                        }
+                        this.compileParameter(sequence);
+                        var jumpTypeToken = this.ax.tokens[this.tokensPos];
+                        if(jumpTypeToken.ex1 || jumpTypeToken.type != Token.Type.PROGCMD || jumpTypeToken.code > 1) {
+                                throw this.error('goto / gosub が指定されていません', token);
+                        }
+                        var isGosub = jumpTypeToken.code == 1;
+                        this.tokensPos ++;
+                        var argc = this.compileParametersSub(sequence);
+                        this.pushNewInsn(sequence, Instruction.Code.ON, [argc, isGosub], token);
                         break;
                 default:
@@ -347 +421 @@
                         token = this.ax.tokens[this.tokensPos];
                         if(token && token.ex2) return;
+                }
+        },
+        skipParameter: function skipParameter(pos) {
+                var size = 0;
+                var parenLevel = 0;
+                while(true) {
+                        var token = this.ax.tokens[pos + size];
+                        if(!token || token.ex1) return size;
+                        if(token.type == Token.Type.MARK) {
+                                switch(token.val) {
+                                case 40:
+                                        parenLevel ++;
+                                        break;
+                                case 41:
+                                        if(parenLevel == 0) return size;
+                                        parenLevel --;
+                                        if(parenLevel == 0) return size + 1;
+                                        break;
+                                case 63:
+                                        return size + 1;
+                                        break;
+                                }
+                        }
+                        size ++;
+                        token = this.ax.tokens[pos + size];
+                        if(parenLevel == 0 && token && token.ex2) {
+                                return size;
+                        }
                 }
         },

lang/javascript/hsp-on-js/trunk/src/evaluator.js

@@ -389 +389 @@
                         }
                         break;
+                case Instruction.Code.GOSUB:
+                        this.subroutineJump(insn.opts[0].pos);
+                        break;
+                case Instruction.Code.GOTO_EXPR:
+                        this.pc = this.scanArg(this.stack.pop(), 'l').toValue().pos - 1;
+                        break;
+                case Instruction.Code.GOSUB_EXPR:
+                        this.subroutineJump(this.scanArg(this.stack.pop(), 'l').toValue().pos);
+                        break;
+                case Instruction.Code.EXGOTO:
+                        var pos = this.scanArg(this.stack.pop(), 'l').toValue().pos;
+                        var b = this.scanArg(this.stack.pop(), 'n').toIntValue()._value;
+                        var mode = this.scanArg(this.stack.pop(), 'n').toIntValue()._value;
+                        var a = this.scanArg(this.scanArg(this.stack.pop(), 'v'), 'i').toIntValue()._value;
+                        if(mode >= 0) {
+                                if(a >= b) this.pc = pos - 1;
+                        } else {
+                                if(a <= b) this.pc = pos - 1;
+                        }
+                        break;
+                case Instruction.Code.EXGOTO_OPT1:
+                        var a = this.scanArg(this.variables[insn.opts[0]].at(0), 'i').toIntValue()._value;
+                        var pos = insn.opts[1].pos;
+                        var b = this.scanArg(this.stack.pop(), 'n').toIntValue()._value;
+                        var mode = this.scanArg(this.stack.pop(), 'n').toIntValue()._value;
+                        if(mode >= 0) {
+                                if(a >= b) this.pc = pos - 1;
+                        } else {
+                                if(a <= b) this.pc = pos - 1;
+                        }
+                        break;
+                case Instruction.Code.EXGOTO_OPT2:
+                        var a = this.scanArg(this.variables[insn.opts[0]].at(0), 'i').toIntValue()._value;
+                        var pos = insn.opts[1].pos;
+                        var b = this.scanArg(this.stack.pop(), 'n').toIntValue()._value;
+                        if(a >= b) this.pc = pos - 1;
+                        break;
+                case Instruction.Code.EXGOTO_OPT3:
+                        var a = this.scanArg(this.variables[insn.opts[0]].at(0), 'i').toIntValue()._value;
+                        var pos = insn.opts[1].pos;
+                        var b = this.scanArg(this.stack.pop(), 'n').toIntValue()._value;
+                        if(a <= b) this.pc = pos - 1;
+                        break;
+                case Instruction.Code.ON:
+                        var argc = insn.opts[0];
+                        var isGosub = insn.opts[1];
+                        for(var i = this.stack.length - argc, l = this.stack.length; i < l; i ++) {
+                                this.scanArg(this.stack[i], 'l');
+                        }
+                        var n = this.scanArg(this.stack[this.stack.length - argc - 1], 'n').toIntValue()._value;
+                        if(!(0 <= n && n < argc)) break;
+                        var pos = this.stack[this.stack.length - argc + n].toValue().pos;
+                        this.stack.length -= argc + 1;
+                        if(isGosub) {
+                                this.subroutineJump(pos);
+                        } else {
+                                this.pc = pos - 1;
+                        }
+                        break;
                 default:
                         throw new Error("未対応の命令コード: "+insn.code);
@@ -465 +524 @@
                 this.pc = userDefFunc.label.pos - 1;
         },
-        subroutineJump: function subroutineJump(label) {
+        subroutineJump: function subroutineJump(pos) {
                 if(this.frameStack.length >= 256) {
                         throw new HSPError(ErrorCode.STACK_OVERFLOW);
                 }
                 this.frameStack.push(new Frame(this.pc + 1, null, null));
-                this.pc = label.pos - 1;
+                this.pc = pos - 1;
         },
         popIndices: function popIndices(argc) {
@@ -654 +713 @@
                 if(arg == undefined) {
                         if(isOptionalArguments) {
-                                return;
+                                return arg;
                         } else {
                                 throw new HSPError(ErrorCode.NO_DEFAULT);
@@ -708 +767 @@
                         break;
                 }
+                return arg;
         }
 };

lang/javascript/hsp-on-js/trunk/src/instruction.js

@@ -56 +56 @@
         'BREAK',
         'FOREACH',
-        'EACHCHK'
+        'EACHCHK',
+        'GOSUB',
+        'GOTO_EXPR',
+        'GOSUB_EXPR',
+        'EXGOTO',
+        'EXGOTO_OPT1',
+        'EXGOTO_OPT2',
+        'EXGOTO_OPT3',
+        'ON'
 ];