From a3f779158626b9ad3c81959b85cbfbbce17425fd Mon Sep 17 00:00:00 2001
From: Kartik Agaram <vc@akkartik.com>
Date: Mon, 2 Nov 2020 19:50:34 -0800
Subject: 7159 - explicitly use 'return' everywhere

https://github.com/akkartik/mu/issues/45#issuecomment-719990879, task 2.
---
 apps/raytracing/3.mu | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'apps/raytracing/3.mu')

diff --git a/apps/raytracing/3.mu b/apps/raytracing/3.mu
index acc2df33..5b87f344 100644
--- a/apps/raytracing/3.mu
+++ b/apps/raytracing/3.mu
@@ -59,7 +59,7 @@ fn ray-color _in: (addr ray), _out: (addr rgb) {
 #?   print-string 0, "\n"
 }
 
-fn main -> exit-status/ebx: int {
+fn main -> _/ebx: int {
 
   # image
   #   width = 400
@@ -221,7 +221,7 @@ fn main -> exit-status/ebx: int {
     j <- decrement
     loop
   }
-  exit-status <- copy 1
+  return 0
 }
 
 type ray {
@@ -457,18 +457,19 @@ fn vec3-unit in: (addr vec3), out: (addr vec3) {
   vec3-scale-down out, len
 }
 
-fn vec3-length v: (addr vec3) -> result/xmm0: float {
-  result <- vec3-length-squared v
+fn vec3-length v: (addr vec3) -> _/xmm0: float {
+  var result/xmm0: float <- vec3-length-squared v
   result <- square-root result
+  return result
 }
 
-fn vec3-length-squared _v: (addr vec3) -> result/xmm0: float {
+fn vec3-length-squared _v: (addr vec3) -> _/xmm0: float {
   var v/esi: (addr vec3) <- copy _v
   # result = v.x * v.x
   var src/eax: (addr float) <- get v, x
   var tmp/xmm1: float <- copy *src
   tmp <- multiply tmp
-  result <- copy tmp
+  var result/xmm0: float <- copy tmp
   # result += v.y * v.y
   src <- get v, y
   tmp <- copy *src
@@ -479,4 +480,5 @@ fn vec3-length-squared _v: (addr vec3) -> result/xmm0: float {
   tmp <- copy *src
   tmp <- multiply tmp
   result <- add tmp
+  return result
 }
-- 
cgit 1.4.1-2-gfad0