Added some of the upcoming v51 Spin2 float functions

Author: totalspectrum

Changelog.txt

@@ -3,6 +3,7 @@ Version 7.1.0
 - Reverted _rx* functions to no longer use 28 bit internal buffer; this is less resilient to P2 side timing changes, but better if PC timing is uncertain
 - Added new Spin2 @\"string" for strings with embedded C-style escapes
 - Added DITTO to duplicate code/data in Spin2 assembly
+- Added some of the upcoming Spin2 v51 float functions
 - Many internal changes to support DITTO and future assembly work
 - Updated -gbrk debug code (thanks Ada)
 - Use cluster size for stat() st_blksize on FAT32

frontends/lexer.c

@@ -23,7 +23,7 @@
 
 #define VT '\013'
 
-#define MAX_PNUT_VERSION 50 /* maximum PNut version we understand */
+#define MAX_PNUT_VERSION 51 /* maximum PNut version we understand */
 
 int allow_type_names = 1;
 
@@ -2494,7 +2494,14 @@ struct reservedword_soft {
 
     /* v50 keywords */
     { "ditto", SP_DITTO, 50, 0 },
-    
+
+    /* v51 keywords */
+    { "log2", SP_LOG2, 51, 0 },
+    { "exp2", SP_EXP2, 51, 0 },
+    { "log10", SP_LOG10, 51, 0 },
+    { "exp10", SP_EXP10, 51, 0 },
+    { "ln",    SP_LOG, 51, 0 },
+    { "exp",   SP_EXP, 51, 0 },
 };
 
 struct reservedword basic_keywords[] = {

frontends/spin/spin.y

@@ -557,6 +557,13 @@ SpinDeclareStruct(AST *ident, AST *defs)
 %token SP_CONDITIONAL_SEP ": after ?"
 %token SP_REPEAT_SEP ": after repeat"
 
+%token SP_LOG2   "LOG2"
+%token SP_EXP2   "EXP2"
+%token SP_LOG10  "LOG10"
+%token SP_EXP10  "EXP10"
+%token SP_LOG    "LN"
+%token SP_EXP    "EXP"
+
 %token SP_FADD   "+."
 %token SP_FSUB   "-."
 %token SP_FMUL   "*."
@@ -2457,6 +2464,48 @@ funccall:
                            params);
         $$ = call;
     }  
+  | SP_LOG2 '(' expr ')'
+    {
+        AST *arg1 = $3;
+        AST *ident = AstIdentifier("__builtin_log2f");
+        
+        $$ = MakeFunccall(ident, arg1, NULL);
+    }
+  | SP_EXP2 '(' expr ')'
+    {
+        AST *arg1 = $3;
+        AST *ident = AstIdentifier("__builtin_exp2f");
+        
+        $$ = MakeFunccall(ident, arg1, NULL);
+    }
+  | SP_LOG10 '(' expr ')'
+    {
+        AST *arg1 = $3;
+        AST *ident = AstIdentifier("__builtin_log10f");
+        
+        $$ = MakeFunccall(ident, arg1, NULL);
+    }
+  | SP_EXP10 '(' expr ')'
+    {
+        AST *arg1 = $3;
+        AST *ident = AstIdentifier("__builtin_exp10f");
+        
+        $$ = MakeFunccall(ident, arg1, NULL);
+    }
+  | SP_LOG '(' expr ')'
+    {
+        AST *arg1 = $3;
+        AST *ident = AstIdentifier("__builtin_logf");
+        
+        $$ = MakeFunccall(ident, arg1, NULL);
+    }
+  | SP_EXP '(' expr ')'
+    {
+        AST *arg1 = $3;
+        AST *ident = AstIdentifier("__builtin_expf");
+        
+        $$ = MakeFunccall(ident, arg1, NULL);
+    }
 ;
 
 

include/libsys/powers.c

@@ -311,6 +311,11 @@ float __builtin_expf(float x)
     return __builtin_powf(CONST_E, x);
 }
 
+float __builtin_exp10f(float x)
+{
+    return __builtin_powf(10.0, x);
+}
+
 float __builtin_logf(float x)
 {
     return __builtin_logbase(CONST_E, x);
@@ -320,3 +325,4 @@ float __builtin_log10f(float x)
 {
     return __builtin_logbase(10.0, x);
 }
+

sys/float.spin

@@ -396,6 +396,7 @@ pri file "libsys/s_ldexpf.c" __builtin_ldexpf(x = float, n=long) : r=float
 pri file "libsys/s_modf.c" __builtin_modff(x = float, p) : r=float
 pri file "libsys/powers.c" __builtin_expf(x = float) : r=float
 pri file "libsys/powers.c" __builtin_exp2f(x = float) : r=float
+pri file "libsys/powers.c" __builtin_exp10f(x = float) : r=float
 pri file "libsys/powers.c" __builtin_logf(x = float) : r=float
 pri file "libsys/powers.c" __builtin_log2f(x = float) : r=float
 pri file "libsys/powers.c" __builtin_log10f(x = float) : r=float