Changeset 2058 for trunk/src/emx/include

Timestamp:

Jun 23, 2005, 7:58:05 AM (20 years ago)

Author:

bird

Message:

Fixed some more incorrectness of the 'C' locale, it only defines the first 128 chars.

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/locale.h (modified) (3 diffs, 1 prop)
• _ctype.h (modified) (3 diffs, 1 prop)
• math.h (modified) (3 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/locale.h

@@ -90 +90 @@
     /** MBCS prefixes. Two bits per character. */
     unsigned char           au2MBCSPrefixs[256/4];
-    /** Unicode translation. (0xffff means not translation.) */
+    /** Unicode translation. (0xffff means no translation.) */
     unsigned short          aucUnicode[256];
     /** Unicode -> SBCS conversion: 0..128. */
@@ -136 +136 @@
     /** Bit flags for every character (for iswXXX() function series). */
     unsigned        aufType[256];
+    /** Mask used to check if an index is within the above arrays.
+     * This is required because 'C' doesn't do more than 0-127. So,
+     * the mask is either ~0xff or ~0x7f. */
+    unsigned        uMask;
 } __LIBC_LOCALEWCTYPE;
 /** Pointer to the Ctype unicode struct. */
@@ -217 +221 @@
 extern const __LIBC_LOCALECTYPE     __libc_GLocaleCtypeDefault;
 /** Cached Unicode (__wchar_t) case conversion tables and flags. */
-extern const __LIBC_LOCALEWCTYPE    __libc_GLocaleWCtype;
+extern __LIBC_LOCALEWCTYPE    __libc_GLocaleWCtype;
 /** Locale information structure. */
 extern __LIBC_LOCALELCONV           __libc_gLocaleLconv;

trunk/src/emx/include/_ctype.h

@@ -71 +71 @@
     /** Bit flags for every character (for iswXXX() function series). */
     unsigned        aufType[256];
+    /** Mask used to check if an index is within the above arrays.
+     * This is required because 'C' doesn't do more than 0-127. So,
+     * the mask is either ~0xff or ~0x7f. */
+    unsigned        uMask;
 } __libc_GLocaleWCtype;
 __END_DECLS
@@ -160 +164 @@
  */
 __BEGIN_DECLS
-static inline unsigned __ctype(__ct_rune_t __ch, unsigned __f)
-{
-    return !((__ch) & ~0xffU)
-        ? __libc_GLocaleCtype.aufType[(__ch)/* & 0xff*/] & (__f)
+static __inline__ unsigned __ctype(__ct_rune_t __ch, unsigned __f)
+{
+    return !(__ch & ~0xffU)
+        ? __libc_GLocaleCtype.aufType[__ch] & __f
         : 0;
 }
 
-static inline int __istype(__ct_rune_t __ch, unsigned __f)
-{
-    return !!__ctype((__ch), (__f));
-}
-
-static inline int __isctype(__ct_rune_t __ch, unsigned __f)
-{
-    return !((__ch) & ~0xffU)
-        ? !!(__libc_GLocaleCtypeDefault.aufType[(__ch)/* & 0xff*/] & (__f))
+static __inline__ int __istype(__ct_rune_t __ch, unsigned __f)
+{
+    return !!__ctype(__ch, __f);
+}
+
+static __inline__ int __isctype(__ct_rune_t __ch, unsigned __f)
+{
+    return !(__ch & ~0xffU)
+        ? !!(__libc_GLocaleCtypeDefault.aufType[__ch] & __f)
         : 0;
 }
 
-static inline __ct_rune_t __toupper(__ct_rune_t __ch)
-{
-    return !((__ch) & ~0xffU)
-        ? __libc_GLocaleCtype.auchUpper[(__ch)/* & 0xff*/]
+static __inline__ __ct_rune_t __toupper(__ct_rune_t __ch)
+{
+    return !(__ch & ~0xffU)
+        ? __libc_GLocaleCtype.auchUpper[__ch]
         : (__ch);
 }
 
-static inline __ct_rune_t __tolower(__ct_rune_t __ch)
-{
-    return !((__ch) & ~0xffU)
-        ? __libc_GLocaleCtype.auchLower[(__ch)/* & 0xff*/]
-        : (__ch);
-}
-
-
-static inline unsigned __wctype(__wint_t __wc, unsigned __f)
-{
-    return !((__wc) & ~0xffU)
-        ? __libc_GLocaleWCtype.aufType[(__wc)] & (__f)
-        : ___wctype(__wc) & (__f);
-}
-
-static inline int __iswtype(__wint_t __wc, unsigned __f)
-{
-    return !!__wctype((__wc), (__f));
-}
-
-static inline __wint_t __towupper(__wint_t __wc)
-{
-    return !((__wc) & ~0xffU)
-        ? __libc_GLocaleWCtype.awcUpper[(__wc)]
+static __inline__ __ct_rune_t __tolower(__ct_rune_t __ch)
+{
+    return !(__ch & ~0xffU)
+        ? __libc_GLocaleCtype.auchLower[__ch]
+        : __ch;
+}
+
+
+static __inline__ unsigned __wctype(__wint_t __wc, unsigned __f)
+{
+    return !(__wc & __libc_GLocaleWCtype.uMask)
+        ? __libc_GLocaleWCtype.aufType[__wc] & __f
+        : ___wctype(__wc) & __f;
+}
+
+static __inline__ int __iswtype(__wint_t __wc, unsigned __f)
+{
+    return !!__wctype(__wc, __f);
+}
+
+static __inline__ __wint_t __towupper(__wint_t __wc)
+{
+    return !(__wc & __libc_GLocaleWCtype.uMask)
+        ? __libc_GLocaleWCtype.awcUpper[__wc]
         : ___towupper(__wc);
 }
 
-static inline __wint_t __towlower(__wint_t __wc)
-{
-    return !((__wc) & ~0xffU)
-        ? __libc_GLocaleWCtype.awcLower[(__wc)]
+static __inline__ __wint_t __towlower(__wint_t __wc)
+{
+    return !(__wc & __libc_GLocaleWCtype.uMask)
+        ? __libc_GLocaleWCtype.awcLower[__wc]
         : ___towlower(__wc);
 }
 
-
-static inline int __wcwidth(__wint_t __wc)
-{
-    if ((__wc) != 0)
+static __inline__ int __wcwidth(__wint_t __wc)
+{
+    if (__wc != 0)
     {
-        unsigned __f = __wctype((__wc), __CT_SCRW_MASK | __CT_PRINT);
-        return ((__f) & __CT_SCRW_MASK)
-            ? ((__f) & __CT_SCRW_MASK) >> __CT_SCRW_SHIFT
-            : ((__f) & __CT_PRINT) ? 1 : -1;
+        unsigned __f = __wctype(__wc, __CT_SCRW_MASK | __CT_PRINT);
+        return (__f & __CT_SCRW_MASK)
+            ? (__f & __CT_SCRW_MASK) >> __CT_SCRW_SHIFT
+            : (__f & __CT_PRINT) ? 1 : -1;
     }
     else
@@ -250 +253 @@
 unsigned    __wctype(__wint_t, unsigned);
 int         __iswtype(__wint_t, unsigned);
-__wint_t     __towupper(__wint_t);
-__wint_t     __towlower(__wint_t);
+__wint_t    __towupper(__wint_t);
+__wint_t    __towlower(__wint_t);
 int         __wcwidth(__wint_t);
 __END_DECLS

trunk/src/emx/include/math.h

@@ -97 +97 @@
     : (sizeof (x) == sizeof (double)) ? __isfinite(x)   \
     : __isfinitel(x))
+#ifdef IN_INNOTEK_LIBC
+#undef isinf
+#define isinf(x)                                        \
+    ((sizeof (x) == sizeof (float)) ? __isinff(x)       \
+    : (sizeof (x) == sizeof (double)) ? _STD(isinf)(x)  \
+    : __isinfl(x))
+#undef isnan
+#define isnan(x)                                        \
+    ((sizeof (x) == sizeof (float)) ? isnanf(x)         \
+    : (sizeof (x) == sizeof (double)) ? _STD(isnan)(x)  \
+    : __isnanl(x))
+#else
 #define isinf(x)                                        \
     ((sizeof (x) == sizeof (float)) ? __isinff(x)       \
@@ -105 +117 @@
     : (sizeof (x) == sizeof (double)) ? isnan(x)        \
     : __isnanl(x))
+#endif
 #define isnormal(x)                                     \
     ((sizeof (x) == sizeof (float)) ? __isnormalf(x)    \
@@ -234 +247 @@
 double  hypot(double, double);
 int     ilogb(double) __pure2;
+#ifdef IN_INNOTEK_LIBC
+int     _STD(isinf)(double) __pure2;
+int     _STD(isnan)(double) __pure2;
+#else
 int     (isinf)(double) __pure2;
 int     (isnan)(double) __pure2;
+#endif
 double  lgamma(double);
 long long llrint(double);