CMakeLists.txt

@@ -65,6 +65,8 @@ add_library(lib${PROJECT_NAME} SHARED
         src/bytecode/bytecode.hh
         src/bytecode/bytecodeprototype.hh
         src/common/overloaded.hh
+        src/vm/code.cc
+        src/vm/code.hh
 )
 
 target_compile_options(lib${PROJECT_NAME} PRIVATE ${warnings})
@@ -74,7 +76,8 @@ target_compile_options(lib${PROJECT_NAME} PRIVATE ${warnings})
 #
 
 add_executable(${PROJECT_NAME}-bytecode-test src/bytecode/tests.cc
-        src/bytecode/constant.hh)
+        src/bytecode/constant.hh
+        src/vm/instruction.hh)
 target_link_libraries(${PROJECT_NAME}-bytecode-test lib${PROJECT_NAME} gtest_main)
 add_test(NAME tyche_bytecode_test COMMAND ${PROJECT_NAME}-bytecode-test)
 

doc/OPCODES

@@ -5,75 +5,77 @@ Operations take either 0 or 1 parameter. The ones that take a parameter, it can
 
 The binary of the opcode is: XXYY.YYYY, where XX defines the parameter type, and YY.YYYY is the instruction. For the XX values:
 
-00 - no parameter
+ ,----------- no parameter
-01 - int8
+ |  ,-------- int8
-10 - int16
+ |  |  ,----- int16
-11 - int32
+ |  |  |   ,-- int32
+NP I8 I16 I32   Opc  Instruction          Description
 
-Stack operations: (0x00~0x1f)
+Stack operations:
-   pushn [int]          Push int
+   a0  c0 e0    pushn [int]          Push int
-   pushc [index]        Push constant
+   a1  c1 e1    pushc [index]        Push constant
-   pushf [function]     Push function id
+   a2  c2 e2    pushf [function]     Push function id
-   pushz                Push zero (or false)
+00              pushz                Push zero (or false)
-   pusht                Push true
+01              pusht                Push true
-   newa                 Push (create) empty array
+02              newa                 Push (create) empty array
-   newt                 Push (create) empty table
+03              newt                 Push (create) empty table
-   pop
+04              pop
-   dup
+05              dup
 
-Local variables: (0x20~0x2f)
+Local variables:
-   setl [int]           Set stack top as indexed local variable
+   a3  c3 e3    setl [int]           Set stack top as indexed local variable
-   getl [int]           Get indexed local variable and place on stack
+   a4  c4 e4    getl [int]           Get indexed local variable and place on stack
-   setg [int]           Set global variable
+   a5  c5 e5    setg [int]           Set global variable
-   getg [int]           Get global variable
+   a6  c6 e6    getg [int]           Get global variable
 
-Function operations: (0x30~0x3f)
+Function operations:
-   call [n_pars]        Enter function on stack toplevel (passing n next stack values as parameters)
+   a7  c7 e7    call [n_pars]        Enter function on stack toplevel (passing n next stack values as parameters)
-   ret                  Leave a function (return value in stack)
+10              ret                Leave a function (return value in stack)
-   retn                 Leave a function (return nil)
+11              retn                 Leave a function (return nil)
 
-Control flow: (0x40~0x4f)
+Table and array operations:
-   bz [pc]              Branch if zero
+16              getkv                Get table's value based on key (pull 1 value, push 1 value)
-   bnz [pc]             Branch if not zero
+17              setkv                Set table's key and value (pull 2 values from stack)
-   jmp [pc]             Unconditional jump
+18              geta                 Get array's position value
+19              seta                 Set array's position value (pull 2 values from stack)
+1a              appnd                Add value to the end of array
+1b              next                 Push the next pair into the stack (for loops)
+1c              smt                  Set value metatable
+1d              mt                   Get value metatable
+
+Logical/arithmetic:
+20              sum                  Sum top 2 values in stack
+21              sub                  Subtract top 2 values in stack
+22              mul                  Multiply top 2 values in stack
+23              div                  Float division
+24              idiv                 Integer division
+25              eq                   Equality
+26              neq                  Inequality
+27              lt                   Less than
+28              lte                  Less than or equals
+29              gt                   Greater than
+2a              gte                  Greater than or equals
+2b              and                  Bitwise AND
+2c              or                   Bitwise OR
+2d              xor                  Bitwise XOR
+
+Other value operations:
+30              len                  Get table, array or string size
+31              type                 Get type from value at the top of the stack
+   b0           cast [type]          Cast type to another type
+32              ver                  Return VM version
+
+External code:
+38              cmpl                 Compile code to assembly
+39              asmbl                Assemble code to bytecode format
+3a              load                 Load bytecode as function (will place function on stack)
+
+Control flow:
+   a8 c8 e8     bz [pc]              Branch if zero
+   a9 c9 e9     bnz [pc]             Branch if not zero
+   aa ca ea     jmp [pc]             Unconditional jump
 * Jumps can only happen within the same function.
 
-Logical/arithmetic: (0x50~0x6f)
-   sum                  Sum top 2 values in stack
-   sub                  Subtract top 2 values in stack
-   mul                  Multiply top 2 values in stack
-   div                  Float division
-   idiv                 Integer division
-   eq                   Equality
-   neq                  Inequality
-   lt                   Less than
-   lte                  Less than or equals
-   gt                   Greater than
-   gte                  Greater than or equals
-   and                  Bitwise AND
-   or                   Bitwise OR
-   xor                  Bitwise XOR
-
-Table and array operations: (0x70~07xf)
-   getkv                Get table's value based on key (pull 1 value, push 1 value)
-   setkv                Set table's key and value (pull 2 values from stack)
-   geta                 Get array's position value
-   seta                 Set array's position value (pull 2 values from stack)
-   appnd                Add value to the end of array
-   next                 Push the next pair into the stack (for loops)
-   smt                  Set value metatable
-   mt                   Get value metatable
-
-Other value operations: (0x80~0x8f)
-   len                  Get table, array or string size
-   type                 Get type from value at the top of the stack
-   cast [type]          Cast type to another type
-   ver                  Return VM version
-
-External code: (0x90~0x9f)
-   cmpl                 Compile code to assembly
-   asmbl                Assemble code to bytecode format
-   load                 Load bytecode as function (will place function on stack)
 
 Error handling: (0xa0~0xaf)
    ???

src/vm/code.cc

@@ -0,0 +1,10 @@
+#include "code.hh"
+
+namespace tyche {
+
+void Code::import_bytecode(Bytecode const& incoming)
+{
+
+}
+
+} // tyche

src/vm/code.hh

@@ -0,0 +1,18 @@
+#ifndef TYCHE_CODE_HH
+#define TYCHE_CODE_HH
+
+#include "../bytecode/bytecode.hh"
+
+namespace tyche {
+
+class Code {
+public:
+    void import_bytecode(Bytecode const& incoming);
+
+private:
+    Bytecode bytecode_;
+};
+
+} // tyche
+
+#endif //TYCHE_CODE_HH

src/vm/instruction.hh

@@ -0,0 +1,14 @@
+#ifndef TYCHE_INSTRUCTION_HH
+#define TYCHE_INSTRUCTION_HH
+
+#include <cstdint>
+
+namespace tyche {
+
+enum class Instruction : uint8_t {
+
+};
+
+}
+
+#endif //TYCHE_INSTRUCTION_HH