Use strtod_l to force the C locale

The normal strtod is locale-sensitive which means that on locales that don’t use the full stop (.) as a separator it won’t be able to parse doubles in the script properly. This patch makes it create a C locale on the vr_config and use it via strtod_l. This function is a GLIBC extension so it is conditionally compiled when using GLIBC. Fixes #34
Igalia · Oct 3, 2018 · 626b679 · 626b679
1 parent ea67091
commit 626b679
Show file tree

Hide file tree

Showing 10 changed files with 242 additions and 51 deletions.
diff --git a/Android.mk b/Android.mk
@@ -43,6 +43,7 @@ VKRUNNER_SRC_FILES := vkrunner/vr-allocate-store.c \
 	vkrunner/vr-script.c \
 	vkrunner/vr-source.c \
 	vkrunner/vr-stream.c \
+	vkrunner/vr-strtof.c \
 	vkrunner/vr-subprocess.c \
 	vkrunner/vr-temp-file.c \
 	vkrunner/vr-test.c \

diff --git a/vkrunner/CMakeLists.txt b/vkrunner/CMakeLists.txt
@@ -49,6 +49,8 @@ set(VKRUNNER_SOURCE_FILES
         vr-source.c
         vr-stream.c
         vr-stream.h
+        vr-strtof.c
+        vr-strtof.h
         vr-temp-file.c
         vr-temp-file.h
         vr-util.c

diff --git a/vkrunner/vr-config.h b/vkrunner/vr-config.h
@@ -29,13 +29,16 @@
 #include <stdbool.h>
 #include "vr-result.h"
 #include "vr-callback.h"
+#include "vr-strtof.h"
 
 struct vr_config {
         bool show_disassembly;
 
         vr_callback_error error_cb;
         vr_callback_inspect inspect_cb;
         void *user_data;
+
+        struct vr_strtof_data strtof_data;
 };
 
 #endif /* VR_CONFIG_H */
diff --git a/vkrunner/vr-executor.c b/vkrunner/vr-executor.c
@@ -169,6 +169,8 @@ vr_executor_new(void)
 {
         struct vr_executor *executor = vr_calloc(sizeof *executor);
 
+        vr_strtof_init(&executor->config.strtof_data);
+
         return executor;
 }
 
@@ -318,5 +320,7 @@ vr_executor_free(struct vr_executor *executor)
 {
         free_context(executor);
 
+        vr_strtof_destroy(&executor->config.strtof_data);
+
         vr_free(executor);
 }
diff --git a/vkrunner/vr-hex.c b/vkrunner/vr-hex.c
@@ -37,7 +37,9 @@
  * pattern to generate a float value.
  */
 float
-vr_hex_strtof(const char *nptr, char **endptr)
+vr_hex_strtof(const struct vr_strtof_data *data,
+              const char *nptr,
+              char **endptr)
 {
         /* skip spaces and tabs */
         while (*nptr == ' ' || *nptr == '\t')
@@ -52,7 +54,7 @@ vr_hex_strtof(const char *nptr, char **endptr)
                 x.u = strtoul(nptr, endptr, 16);
                 return x.f;
         } else {
-                return strtod(nptr, endptr);
+                return vr_strtod(data, nptr, endptr);
         }
 }
 
@@ -61,7 +63,9 @@ vr_hex_strtof(const char *nptr, char **endptr)
  * pattern to generate a double value.
  */
 double
-vr_hex_strtod(const char *nptr, char **endptr)
+vr_hex_strtod(const struct vr_strtof_data *data,
+              const char *nptr,
+              char **endptr)
 {
         /* skip spaces and tabs */
         while (*nptr == ' ' || *nptr == '\t')
@@ -76,7 +80,7 @@ vr_hex_strtod(const char *nptr, char **endptr)
                 x.u64 = strtoull(nptr, endptr, 16);
                 return x.d;
         } else {
-                return strtod(nptr, endptr);
+                return vr_strtod(data, nptr, endptr);
         }
 }
 
@@ -85,7 +89,9 @@ vr_hex_strtod(const char *nptr, char **endptr)
  * generate a signed int value.
  */
 int
-vr_hex_strtol(const char *nptr, char **endptr)
+vr_hex_strtol(const struct vr_strtof_data *data,
+              const char *nptr,
+              char **endptr)
 {
         /* skip spaces and tabs */
         while (*nptr == ' ' || *nptr == '\t')
@@ -109,7 +115,9 @@ vr_hex_strtol(const char *nptr, char **endptr)
  * hex bit pattern to generate a half float value.
  */
 uint16_t
-vr_hex_strtohf(const char *nptr, char **endptr)
+vr_hex_strtohf(const struct vr_strtof_data *data,
+               const char *nptr,
+               char **endptr)
 {
         /* skip spaces and tabs */
         while (*nptr == ' ' || *nptr == '\t')
@@ -124,6 +132,6 @@ vr_hex_strtohf(const char *nptr, char **endptr)
                         return u;
                 }
         } else {
-                return vr_half_float_from_float(strtod(nptr, endptr));
+                return vr_half_float_from_float(vr_strtod(data, nptr, endptr));
         }
 }
diff --git a/vkrunner/vr-hex.h b/vkrunner/vr-hex.h
@@ -25,17 +25,26 @@
 #define VR_HEX_H
 
 #include <stdint.h>
+#include "vr-strtof.h"
 
 float
-vr_hex_strtof(const char *nptr, char **endptr);
+vr_hex_strtof(const struct vr_strtof_data *data,
+              const char *nptr,
+              char **endptr);
 
 double
-vr_hex_strtod(const char *nptr, char **endptr);
+vr_hex_strtod(const struct vr_strtof_data *data,
+              const char *nptr,
+              char **endptr);
 
 int
-vr_hex_strtol(const char *nptr, char **endptr);
+vr_hex_strtol(const struct vr_strtof_data *data,
+              const char *nptr,
+              char **endptr);
 
 uint16_t
-vr_hex_strtohf(const char *nptr, char **endptr);
+vr_hex_strtohf(const struct vr_strtof_data *data,
+               const char *nptr,
+               char **endptr);
 
 #endif /* VR_HEX_H */