Finished asm

Author: Timchenkovich

.gitignore

@@ -0,0 +1,5 @@
+.antlr/
+.vscode/
+.cache/
+.DS_Store/
+build/

asm/CMakeLists.txt

@@ -75,7 +75,7 @@ add_subdirectory(instruction-creator)
 
 add_library(emulatorGenerated ${asm_ISA_SOURCES})
 
-llvm_map_components_to_libnames(llvm_libs core executionengine mcjit ${LLVM_TARGETS_TO_BUILD})
+llvm_map_components_to_libnames(llvm_libs core executionengine mcjit interpreter ${LLVM_TARGETS_TO_BUILD})
 # this will also bring includes
 target_link_libraries(emulatorGenerated instructionCreator ${llvm_libs})
 

asm/app.s

@@ -1,27 +1,25 @@
+; x12, x13 are temps
 fun draw_half_circle:
-    ; x9 - x, x10 - y, x14 - r, x11 - dir, x2 - color
+    ; x9 - xc, x10 - yc, x14 - r, x11 - dir, x2 - color
     muladd x15, x14, x11, x10
     putpxl x9, x15, x2
     muladd x15, x14, x11, x9
     putpxl x15, x10, x2
     mul x15, x14, x11
     sub x15, x9, x15
     putpxl x15, x10, x2
-    cmplt x15, x14, 0
+    jnpos x14, quit
 
     mov x12, 0 ; x12 is x
     mov x13, x14 ; x13 is y
 
-    cj x15, skip_ret
-    ret
-skip_ret:
     shl x15, x14, 1
-    sub x15, 3, x15 
-    ; x15 is d
+    sub x15, 3, x15     ; x15 is d
+    ; x16 is temp
 
 loop:
     jnpos x15, d_not_positive
-    sub x13, x13, 1
+    sub x13, x13, 1 ; y--
     sub x16, x12, x13
     shl x16, x16, 2
     add x16, x16, 10
@@ -32,21 +30,33 @@ d_not_positive:
     add x16, x16, 6
     add x15, x15, x16
 draw:
-    add x12, x12, 1
+    add x12, x12, 1 ; x++
+
+    ; x17 is x * dir, x19 is dir * x + xc
     mul x17, x11, x12
     add x19, x17, x9
+
+    ; x18 is dir * y, x20 is dir * y + yc
     mul x18, x11, x13
     add x20, x18, x10
     putpxl x19, x20, x2
+
+    ; x19 is xc - x * dir
     sub x19, x9, x17
-    putpxl x19, x20, x2
+    putpxl x19, x20, x2 
+
+    ; x19 is dir * y + xc, x20 is x * dir + yc
     add x19, x18, x9
     add x20, x17, x10
     putpxl x19, x20, x2
+
+    ; x19 is xc - dir * y
     sub x19, x9, x18
     putpxl x19, x20, x2
+
     cmpgte x19, x13, x12
     cj x19, loop
+quit:
     ret
 
 fun main:
@@ -59,12 +69,15 @@ fun main:
     ; x0 is cur_x, x1 is cur_y, x2 is color, x3 is dir_x, x4 is bc_delta, x5 is dir_y
     ; x6 is x, x7 is y, x8 is background_color
     mov x11, 1
+    mov x4, -16843009 ; init bc_delta
 
 label22:
 label27:
     putpxl x6, x7, x8
     incjneq x6, 512, label27
+    mov x6, 0
     incjneq x7, 256, label22
+    mov x7, 0
 
     add x9, x0, 30
     add x10, x1, 30
@@ -88,28 +101,31 @@ label27:
     call draw_half_circle
 
     mov x14, 15
-
+    add x9, x0, 30
     add x10, x1, 33
-    call draw_half_circle
     mov x11, 1
     call draw_half_circle
 
-    add x9, x0, 63
+    ; adjust positions
+    add x9, x0, 63 ; cur_x + 2 * RADIUS + STEP
     cmpgt x12, x9, 511
     cmplt x13, x0, 3
     or x12, x12, x13
     sub x13, 0, x3
-    select x3, x3, x13, x3
+    select x3, x12, x13, x3
+
     cmplt x12, x1, 3
     add x10, x1, 63
     cmpgt x13, x10, 255
     or x12, x12, x13
     sub x13, 0, x5
-    select x5, x5, x13, x5
+    select x5, x12, x13, x5
 
     muladd x0, x3, 3, x0
     muladd x1, x5, 3, x1
 
+    ; change colors
+
     cmpneq x12, x8, 0
     cmpneq x13, x8, -1
     and x12, x12, x13

asm/instruction-creator/branchInstructionCreator.cpp

@@ -110,7 +110,7 @@ std::any branchInstructionCreator::visitBranch(asmParser::BranchContext* ctx) {
 
     int64_t imm = std::stoll(ctx->IMM()->getText());
     Value* cmp = moduleCtx_.getBuilder().CreateICmp(
-        CmpInst::Predicate::ICMP_SLE, getRegisterValue(regIdx),
+        CmpInst::Predicate::ICMP_NE, inc,
         ConstantInt::get(Type::getInt64Ty(moduleCtx_.getContext()), imm));
 
     BasicBlock* nextBB = desc_.getDescriptor(curFun_).getBB(nextLabel.value());

asm/instruction-creator/utils/utils.cpp

@@ -2,7 +2,10 @@
 
 std::pair<OpType, int64_t> unpackRegOrImm(asmParser::RegOrImmContext* ctx) {
   if (ctx->IMM()) {
-    return {OpType::IMM, std::stoll(ctx->IMM()->getText())};
+    bool minus = ctx->MINUS();
+    int64_t val = std::stoll(ctx->IMM()->getText());
+    val = minus ? -val : val;
+    return {OpType::IMM, val};
   }
 
   return {OpType::REG, getRegisterIdx(ctx->REG()->getText())};

asm/isa-creator/isaCreator.cpp

@@ -108,10 +108,15 @@ void isaCreator::exitInstruction(isaParser::InstructionContext* ctx) {
 }
 
 void isaCreator::generateFunctionCreator(isaParser::IsaContext* ctx) {
-  emulatorSource_.println(std::format("void* {}::{}(const std::string& fn) {{",
+  emulatorSource_.println(std::format("void* {}::{}(std::string_view fn) {{",
                                       getEmulatorNamespace(),
                                       getFunctionCreatorName()));
   emulatorSource_.indent();
+  emulatorSource_.println("#if defined(__APPLE__) && defined(__MACH__)");
+  emulatorSource_.println("// mach o symbols are prefixed with '_'");
+  emulatorSource_.println("fn.remove_prefix(1);");
+  emulatorSource_.println("#endif");
+
   for (auto* instruction : ctx->instruction()) {
     emulatorSource_.println(std::format("if (fn == \"{}\") {{",
                                         instruction->INSTR_NAME()->getText()));
@@ -176,8 +181,8 @@ void isaCreator::generateEmulatorPreamble() {
                                       getRegisterType(), getRegisterCount(),
                                       getRegsVarName()));
 
-  emulatorHeader_.println(std::format("void* {}(const std::string& fn);",
-                                      getFunctionCreatorName()));
+  emulatorHeader_.println(
+      std::format("void* {}(std::string_view fn);", getFunctionCreatorName()));
 
   emulatorHeader_.println(std::format("void {}(moduleContext& module);",
                                       getModuleRegistratorName()));

asm/lift.cpp

@@ -28,9 +28,6 @@ extern "C" {
 #include "source-descriptor/sourceDescriptor.h"
 
 namespace {
-constexpr size_t REG_FILE_SIZE = 32;
-std::array<int64_t, REG_FILE_SIZE> regs = {0};
-
 constexpr std::string_view ASM_PATH = "asm-path";
 constexpr std::string_view MODE = "mode";
 constexpr std::string_view DUMP_SHORT = "d";
@@ -96,7 +93,7 @@ int main(int argc, char** argv) {
   };
 
   llvm::ArrayType* regFileType =
-      llvm::ArrayType::get(builder.getInt64Ty(), REG_FILE_SIZE);
+      llvm::ArrayType::get(builder.getInt64Ty(), asmEmulator::REGS.size());
   if (emulating) {
     llvmModule->getOrInsertGlobal(REG_FILE_NAME, regFileType);
     regFileHolder = llvmModule->getNamedGlobal(REG_FILE_NAME);
@@ -107,7 +104,7 @@ int main(int argc, char** argv) {
   };
 
   moduleContext ctx("asmGenerated", *std::visit(regFileGetter, regFileHolder),
-                    moduleCtx, builder, *llvmModule, REG_FILE_SIZE);
+                    moduleCtx, builder, *llvmModule, asmEmulator::REGS.size());
 
   asmEmulator::registerFunctions(ctx);
 
@@ -147,17 +144,21 @@ int main(int argc, char** argv) {
   LLVMInitializeNativeTarget();
   LLVMInitializeNativeAsmPrinter();
 
-  llvm::ExecutionEngine* ee =
-      llvm::EngineBuilder(std::move(llvmModule)).create();
+  std::string errorStr;
+
+  llvm::ExecutionEngine* ee = llvm::EngineBuilder(std::move(llvmModule))
+                                  .setErrorStr(&errorStr)
+                                  .create();
   if (!ee) {
-    std::cerr << "Failed creating execution engine." << std::endl;
+    std::cerr << "Failed creating execution engine: " << errorStr << std::endl;
     return 1;
   }
 
   ee->InstallLazyFunctionCreator(asmEmulator::emulatorCaller);
-  ee->finalizeObject();
+  // ee->finalizeObject();
 
-  ee->addGlobalMapping(&ctx.getRegFile(), reinterpret_cast<void*>(regs.data()));
+  ee->addGlobalMapping(&ctx.getRegFile(),
+                       reinterpret_cast<void*>(asmEmulator::REGS.data()));
 
   simInit();
   llvm::GenericValue res =