Fixed NO_FP support

abduld · Feb 10, 2011 · 54dc937 · 54dc937
1 parent 5986528
commit 54dc937
Show file tree

Hide file tree

Showing 7 changed files with 585 additions and 1 deletion.
diff --git a/cstdlib/math.c b/cstdlib/math.c
@@ -2,6 +2,7 @@
 #include "../picoc.h"
 
 #ifndef BUILTIN_MINI_STDLIB
+#ifndef NO_FP
 
 static double M_EValue = 2.7182818284590452354; /* e */
 static double M_LOG2EValue = 1.4426950408889634074; /* log_2 e */
@@ -182,4 +183,5 @@ void MathSetupFunc(void)
  VariableDefinePlatformVar(NULL, "M_SQRT1_2", &FPType, (union AnyValue *)&M_SQRT1_2Value, FALSE);
 }
 
+#endif /* !NO_FP */
 #endif /* !BUILTIN_MINI_STDLIB */
diff --git a/cstdlib/stdio.c b/cstdlib/stdio.c
@@ -201,9 +201,11 @@ int StdioBasePrintf(struct ParseState *Parser, FILE *Stream, char *StrOut, int S
  {
  case 'd': case 'i': ShowType = &IntType; break; /* integer decimal */
  case 'o': case 'u': case 'x': case 'X': ShowType = &IntType; break; /* integer base conversions */
+#ifndef NO_FP
  case 'e': case 'E': ShowType = &FPType; break; /* double, exponent form */
  case 'f': case 'F': ShowType = &FPType; break; /* double, fixed-point */
  case 'g': case 'G': ShowType = &FPType; break; /* double, flexible format */
+#endif
  case 'a': case 'A': ShowType = &IntType; break; /* hexadecimal, 0x- format */
  case 'c': ShowType = &IntType; break; /* character */
  case 's': ShowType = CharPtrType; break; /* string */
@@ -257,6 +259,7 @@ int StdioBasePrintf(struct ParseState *Parser, FILE *Stream, char *StrOut, int S
  else
  StdioOutPuts("XXX", &SOStream);
  }
+#ifndef NO_FP
  else if (ShowType == &FPType)
  {
  /* show a floating point number */
@@ -265,6 +268,7 @@ int StdioBasePrintf(struct ParseState *Parser, FILE *Stream, char *StrOut, int S
  else
  StdioOutPuts("XXX", &SOStream);
  } 
+#endif
  else if (ShowType == CharPtrType)
  {
  if (ThisArg->Typ->Base == TypePointer)

diff --git a/cstdlib/stdlib.c b/cstdlib/stdlib.c
@@ -5,10 +5,12 @@
 
 static int ZeroValue = 0;
 
+#ifndef NO_FP
 void StdlibAtof(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
  ReturnValue->Val->FP = atof(Param[0]->Val->Pointer);
 }
+#endif
 
 void StdlibAtoi(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
@@ -20,10 +22,12 @@ void StdlibAtol(struct ParseState *Parser, struct Value *ReturnValue, struct Val
  ReturnValue->Val->Integer = atol(Param[0]->Val->Pointer);
 }
 
+#ifndef NO_FP
 void StdlibStrtod(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
  ReturnValue->Val->FP = strtod(Param[0]->Val->Pointer, Param[1]->Val->Pointer);
 }
+#endif
 
 void StdlibStrtol(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
@@ -130,10 +134,12 @@ typedef struct { \
 /* all stdlib.h functions */
 struct LibraryFunction StdlibFunctions[] =
 {
+#ifndef NO_FP
  { StdlibAtof, "float atof(char *);" },
+ { StdlibStrtod, "float strtod(char *,char **);" },
+#endif
  { StdlibAtoi, "int atoi(char *);" },
  { StdlibAtol, "int atol(char *);" },
- { StdlibStrtod, "float strtod(char *,char **);" },
  { StdlibStrtol, "int strtol(char *,char **,int);" },
  { StdlibStrtoul, "int strtoul(char *,char **,int);" },
  { StdlibMalloc, "void *malloc(int);" },

diff --git a/cstdlib/time.c b/cstdlib/time.c
@@ -29,10 +29,12 @@ void StdCtime(struct ParseState *Parser, struct Value *ReturnValue, struct Value
  ReturnValue->Val->Pointer = ctime(Param[0]->Val->Pointer);
 }
 
+#ifndef NO_FP
 void StdDifftime(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
  ReturnValue->Val->FP = difftime((time_t)Param[0]->Val->Integer, Param[1]->Val->Integer);
 }
+#endif
 
 void StdGmtime(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
@@ -88,7 +90,9 @@ struct LibraryFunction StdTimeFunctions[] =
  { StdAsctime, "char *asctime(struct tm *);" },
  { StdClock, "time_t clock();" },
  { StdCtime, "char *ctime(int *);" },
+#ifndef NO_FP
  { StdDifftime, "double difftime(int, int);" },
+#endif
  { StdGmtime, "struct tm *gmtime(int *);" },
  { StdGmtime_r, "struct tm *gmtime_r(int *, struct tm *);" },
  { StdLocaltime, "struct tm *localtime(int *);" },

diff --git a/expression.c b/expression.c
@@ -1231,7 +1231,11 @@ void ExpressionParseMacroCall(struct ParseState *Parser, struct ExpressionStack
  if (Parser->Mode == RunModeRun) 
  { 
  /* create a stack frame for this macro */
+#ifndef NO_FP
  ExpressionStackPushValueByType(Parser, StackTop, &FPType); /* largest return type there is */
+#else
+ ExpressionStackPushValueByType(Parser, StackTop, VoidPtrType); /* largest return type there is */
+#endif
  ReturnValue = (*StackTop)->Val;
  HeapPushStackFrame();
  ParamArray = HeapAllocStack(sizeof(struct Value *) * MDef->NumParams); 

diff --git a/include.c b/include.c
@@ -21,7 +21,9 @@ void IncludeInit()
 #ifndef BUILTIN_MINI_STDLIB
  IncludeRegister("ctype.h", NULL, &StdCtypeFunctions[0], NULL);
  IncludeRegister("errno.h", &StdErrnoSetupFunc, NULL, NULL);
+#ifndef NO_FP
  IncludeRegister("math.h", &MathSetupFunc, &MathFunctions[0], NULL);
+#endif
  IncludeRegister("stdbool.h", &StdboolSetupFunc, NULL, StdboolDefs);
  IncludeRegister("stdio.h", &StdioSetupFunc, &StdioFunctions[0], StdioDefs);
  IncludeRegister("stdlib.h", &StdlibSetupFunc, &StdlibFunctions[0], NULL);