Merge pull request #30 from Robby-Blue/main

fix mistakes that yeti made while very very tired
callisto-lang · Nov 15, 2024 · 1460a16 · 1460a16
2 parents 34cc61d + 7d3d161
commit 1460a16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/source/backends/rm86.d b/source/backends/rm86.d
@@ -297,7 +297,7 @@ class BackendRM86 : CompilerBackend {
 					output ~= format("call __func__%s\n", node.name.Sanitise());
 
 					if (word.error && words[thisFunc].error) {
-						output ~= "pop si\n";
+						output ~= "pop di\n";
 					}
 				}
 			}
@@ -320,6 +320,7 @@ class BackendRM86 : CompilerBackend {
 						output ~= format("jne __func__%s\n", Sanitise("__rm86_exception"));
 					}
 					else {
+                        output ~= "mov si, di\n";
 						CompileReturn(node);
 					}
 				}

diff --git a/source/backends/uxn.d b/source/backends/uxn.d
@@ -253,7 +253,7 @@ class BackendUXN : CompilerBackend {
 					output ~= format("func__%s\n", node.name.Sanitise());
 
 					if (word.error && words[thisFunc].error) {
-						output ~= "LITr -System/wst DEOr\n";
+						output ~= "LITr -temp STZr\n";
 					}
 				}
 			}
@@ -275,6 +275,7 @@ class BackendUXN : CompilerBackend {
 						output ~= format(";func__%s JCN2\n", Sanitise("__uxn_exception"));
 					}
 					else {
+                        output ~= ".temp LDZ .System/wst DEO\n";
 						CompileReturn(node);
 					}
 				}