add a generator that generates src/gen/sl_vm_opcode_t.h from the DSL

Author: haileys

.gitignore

@@ -11,4 +11,5 @@ local.mk
 src/init_exts.c
 src/lib/error_page.c
 src/CaseFolding-3.2.0.txt
+src/gen
 tmp

inc/slash/vm.h

@@ -113,56 +113,6 @@ typedef struct sl_vm {
 }
 sl_vm_t;
 
-enum {
-    SL_OP_RAW,
-    SL_OP_ECHO,
-    SL_OP_ECHO_RAW,
-    SL_OP_NOT,
-    SL_OP_MOV,
-    SL_OP_GET_OUTER,
-    SL_OP_GET_IVAR,
-    SL_OP_GET_CVAR,
-    SL_OP_GET_CONST,
-    SL_OP_GET_OBJECT_CONST,
-    SL_OP_SET_OUTER,
-    SL_OP_SET_IVAR,
-    SL_OP_SET_CVAR,
-    SL_OP_SET_CONST,
-    SL_OP_SET_OBJECT_CONST,
-    SL_OP_IMMEDIATE,
-    SL_OP_SEND,
-    SL_OP_SEND_SELF,
-    SL_OP_JUMP,
-    SL_OP_JUMP_IF,
-    SL_OP_JUMP_UNLESS,
-    SL_OP_CLASS,
-    SL_OP_DEFINE,
-    SL_OP_DEFINE_ON,
-    SL_OP_LAMBDA,
-    SL_OP_SELF,
-    SL_OP_ARRAY,
-    SL_OP_ARRAY_DUMP,
-    SL_OP_DICT,
-    SL_OP_RETURN,
-    SL_OP_RANGE_IN,
-    SL_OP_RANGE_EX,
-    SL_OP_LINE_TRACE,
-    SL_OP_ABORT,
-    SL_OP_THROW,
-    SL_OP_TRY,
-    SL_OP_END_TRY,
-    SL_OP_CATCH,
-    SL_OP_YADA_YADA,
-    SL_OP_BIND_METHOD,
-    SL_OP_USE,
-    SL_OP_USE_TOP_LEVEL,
-    SL_OP_BUILD_STRING,
-
-    SL_OP__MAX_OPCODE
-};
-
-typedef uint8_t sl_vm_opcode_t;
-
 typedef struct sl_vm_inline_method_cache {
     uint32_t state;
     SLVAL klass;
@@ -180,6 +130,8 @@ typedef struct sl_vm_inline_constant_cache {
 }
 sl_vm_inline_constant_cache_t;
 
+typedef size_t sl_vm_opcode_t;
+
 typedef union sl_vm_insn {
     sl_vm_opcode_t                  opcode;
     void*                           threaded_opcode;

scripts/vm_generator.rb

@@ -0,0 +1,61 @@
+class Operand
+  attr_reader :type, :name
+
+  def initialize(type, name)
+    @type, @name = type, name
+  end
+end
+
+class Instruction
+  attr_reader :name, :operands, :code
+
+  def initialize(name, operands, code)
+    @name, @operands, @code = name, operands, code
+  end
+
+  def self.parse(str)
+    first, *rest = str.lines.to_a
+
+    unless /\A(?<name>[A-Z_]+)\((?<args>.*)\)\Z/ =~ first
+      raise "Syntax error on line: #{first.inspect}"
+    end
+
+    operands = args.split(",").map { |arg|
+      arg.strip.split
+    }.map { |type, name|
+      Operand.new(type, name)
+    }
+
+    new(name, operands, rest.join)
+  end
+end
+
+source = File.read("src/vm_defn.inc")
+
+# remove C-style /*...*/ comments
+source.gsub!(%r{/\* .*? \*/}x, "")
+
+# remove C++-style // comments
+source.gsub!(%r{//.*$}, "")
+
+# parse out instructions
+insns = source.lines.slice_before { |line|
+  line =~ /^[A-Z_]+\(/
+}.map { |lines|
+  lines.join
+}.reject { |section|
+  section.empty?
+}.map { |section|
+  Instruction.parse(section)
+}
+
+# generate the opcode enum
+File.open("src/gen/opcode_enum.inc", "w") do |f|
+  f.puts "enum {"
+  insns.each_with_index do |insn, index|
+    f.printf "    SL_OP_%-16s = %2d,\n", insn.name, index
+  end
+  f.puts
+  f.puts "    SL_OP__MAX_OPCODE"
+  f.puts "};"
+end