From: fennecdjay <astor.jeremie@wanadoo.fr>
Date: Fri, 19 Jul 2019 13:05:20 +0000 (+0200)
Subject: :art: VM improv
X-Git-Tag: nightly~2320
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=69fa3ad54f0ea8944084902bce0e89d38155acee;p=gwion.git

:art: VM improv
---

diff --git a/src/vm/vm.c b/src/vm/vm.c
index 69e4c163..2e4bd7c1 100644
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -203,7 +203,7 @@ DISPATCH()
 
 #define IF_LOGICAL(op)\
   reg -= SZ_FLOAT; \
-  *(m_int*)(reg-SZ_INT) = (*(m_int*)(reg-SZ_INT) op (m_int)*(m_float*)reg); \
+  *(m_int*)(reg-SZ_INT) = (m_int)(*(m_int*)(reg-SZ_INT) op *(m_float*)reg); \
   DISPATCH()
 __attribute__((hot))
 
@@ -217,10 +217,10 @@ __attribute__((hot))
   reg -= SZ_INT; \
   *(m_float*)(reg-SZ_FLOAT) op##= (m_float)*(m_int*)reg; \
   DISPATCH()
-  
+
 #define FI_LOGICAL(op) \
   reg -= SZ_FLOAT; \
-  *(m_int*)(reg-SZ_INT) = ((m_int)*(m_float*)(reg-SZ_INT) op\
+  *(m_int*)(reg-SZ_INT) = (m_int)(*(m_float*)(reg-SZ_INT) op\
     *(m_int*)(reg + SZ_FLOAT-SZ_INT)); \
   DISPATCH()
 
@@ -228,7 +228,7 @@ __attribute__((hot))
   reg -= SZ_FLOAT; \
   __VA_ARGS__ \
   *(m_int*)(reg-SZ_INT) = (**(m_int**)(reg+SZ_FLOAT -SZ_INT) op##= \
-    (m_int)(*(m_float*)(reg-SZ_INT))); \
+    /*(m_int)*/(*(m_float*)(reg-SZ_INT))); \
   DISPATCH()