change Rune from ushort to uint for to 21 bit runes (thanks mischief!)

big big change. requires rebuilding 8c first and then rebuild
everything.

diff --git a/386/include/u.h b/386/include/u.h
index e324c8ad340ad0db85dc78b44524128d3d362469..ebccf02e870d2e41968bf919f0198841319c1304 100644 (file)
--- a/386/include/u.h
+++ b/386/include/u.h
@@ -3,12 +3,12 @@ typedef       unsigned short  ushort;
 typedef        unsigned char   uchar;
 typedef unsigned long  ulong;
 typedef unsigned int   uint;
-typedef   signed char  schar;
+typedef signed char    schar;
 typedef        long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long  uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef union FPdbleword FPdbleword;
 typedef long           jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/68000/include/u.h b/68000/include/u.h
index 50b91a02c594dc92af7ffa8dddbc253af0ced9c6..445edbfb4b406bead2a7bc1f1f337deebb1fdb67 100644 (file)
--- a/68000/include/u.h
+++ b/68000/include/u.h
@@ -8,7 +8,7 @@ typedef long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long  uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef        union FPdbleword FPdbleword;
 typedef long   jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/68020/include/u.h b/68020/include/u.h
index 7ff92a408f0fd466868d14b0638caeb556dab804..d4942b8fbc96ad63133283909041cd4d7b5f1423 100644 (file)
--- a/68020/include/u.h
+++ b/68020/include/u.h
@@ -8,7 +8,7 @@ typedef long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long  uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef        union FPdbleword FPdbleword;
 typedef long   jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/alpha/include/u.h b/alpha/include/u.h
index f6614449e2cae959fb3e70f77855f809928fc254..92fea5c7c462645e0633de0c0330700c6860dd4f 100644 (file)
--- a/alpha/include/u.h
+++ b/alpha/include/u.h
@@ -3,12 +3,12 @@ typedef       unsigned short  ushort;
 typedef        unsigned char   uchar;
 typedef unsigned long  ulong;
 typedef unsigned int   uint;
-typedef   signed char  schar;
+typedef signed char    schar;
 typedef        long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long  uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef        union FPdbleword FPdbleword;
 typedef long   jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/amd64/include/u.h b/amd64/include/u.h
index 8dce5066fcb92b2e4ba821abdbfd14a4db0c5f7c..742de10355ebff15afdda3465ed13c06b72093de 100644 (file)
--- a/amd64/include/u.h
+++ b/amd64/include/u.h
@@ -3,12 +3,12 @@ typedef       unsigned short  ushort;
 typedef        unsigned char   uchar;
 typedef unsigned long  ulong;
 typedef unsigned int   uint;
-typedef   signed char  schar;
+typedef signed char    schar;
 typedef        long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long long uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef union FPdbleword FPdbleword;
 typedef uintptr                jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/arm/include/u.h b/arm/include/u.h
index db55db33d5e5019544700b5de7d28896638d0f62..916b8cc6f26ba6e0d28534a50b1cd90dba5d629e 100644 (file)
--- a/arm/include/u.h
+++ b/arm/include/u.h
@@ -9,7 +9,7 @@ typedef long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long  uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef        union FPdbleword FPdbleword;
 typedef long   jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/mips/include/u.h b/mips/include/u.h
index 08f7832b79d3f6fbe4dc921535a54a72d1598af7..c30ebd8827384618caab68df826ee9fa9ab124c3 100644 (file)
--- a/mips/include/u.h
+++ b/mips/include/u.h
@@ -8,7 +8,7 @@ typedef long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long  uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef        union FPdbleword FPdbleword;
 typedef long   jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/power/include/u.h b/power/include/u.h
index f84422ccf22af037ac4dcefe4fc9cd39f50f5e14..27a88d27416c0ae2d6accecc9954eea7106168e9 100644 (file)
--- a/power/include/u.h
+++ b/power/include/u.h
@@ -3,12 +3,12 @@ typedef       unsigned short  ushort;
 typedef        unsigned char   uchar;
 typedef        unsigned long   ulong;
 typedef        unsigned int    uint;
-typedef          signed char   schar;
+typedef        signed char     schar;
 typedef        long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long  uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef union FPdbleword FPdbleword;
 typedef long           jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/power64/include/u.h b/power64/include/u.h
index d9dbf50beaa2d83be9a35cc77fccb9d3a4710099..7f4c22c9639157149d77be2a3b4e1ddbe284b46e 100644 (file)
--- a/power64/include/u.h
+++ b/power64/include/u.h
@@ -8,7 +8,7 @@ typedef long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long long uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef        union FPdbleword FPdbleword;
 typedef uintptr        jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/sparc/include/u.h b/sparc/include/u.h
index cc2cb1f973b6ffd4b5c3dbefa96c395515daae82..fe9fbff2d4a10d8721c454a9492276f9a70902ad 100644 (file)
--- a/sparc/include/u.h
+++ b/sparc/include/u.h
@@ -8,7 +8,7 @@ typedef long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long  uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef        union FPdbleword FPdbleword;
 typedef long   jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/sparc64/include/u.h b/sparc64/include/u.h
index cc2cb1f973b6ffd4b5c3dbefa96c395515daae82..fe9fbff2d4a10d8721c454a9492276f9a70902ad 100644 (file)
--- a/sparc64/include/u.h
+++ b/sparc64/include/u.h
@@ -8,7 +8,7 @@ typedef long long       vlong;
 typedef        unsigned long long uvlong;
 typedef unsigned long  uintptr;
 typedef unsigned long  usize;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef        union FPdbleword FPdbleword;
 typedef long   jmp_buf[2];
 #define        JMPBUFSP        0

diff --git a/sys/include/ape/limits.h b/sys/include/ape/limits.h
index 0837bbe1d283527431ac86bc5b607fcd99269264..8986b7bf4f9a1cf72d0121f3960ebc9f6f38dbe1 100644 (file)
--- a/sys/include/ape/limits.h
+++ b/sys/include/ape/limits.h
@@ -3,7 +3,7 @@
 /* 8 bit chars (signed), 16 bit shorts, 32 bit ints/longs */
 
 #define CHAR_BIT       8
-#define MB_LEN_MAX     3
+#define MB_LEN_MAX     4
 
 #define UCHAR_MAX      0xff
 #define USHRT_MAX      0xffff

diff --git a/sys/include/ape/u.h b/sys/include/ape/u.h
index 87af9d1cd145cd8710b8045e5f48a2f1a46d9616..4ce76619448c56833bf4349b82ff3ae60a34e83f 100644 (file)
--- a/sys/include/ape/u.h
+++ b/sys/include/ape/u.h
@@ -9,10 +9,10 @@ typedef       unsigned short  ushort;
 typedef        unsigned char   uchar;
 typedef unsigned long  ulong;
 typedef unsigned int   uint;
-typedef   signed char  schar;
+typedef signed char    schar;
 typedef        long long       vlong;
 typedef        unsigned long long uvlong;
-typedef        ushort          Rune;
+typedef        uint            Rune;
 typedef        union FPdbleword FPdbleword;
 typedef        char*   p9va_list;
 

diff --git a/sys/include/ape/utf.h b/sys/include/ape/utf.h
index bba977100434fb8591b24df0f249439b35cc5707..c78b94fee13d83cba18ec32bbf4fb340a144cb86 100644 (file)
--- a/sys/include/ape/utf.h
+++ b/sys/include/ape/utf.h
@@ -7,15 +7,15 @@
 extern "C" { 
 #endif
 
-typedef unsigned short Rune;   /* 16 bits */
+typedef unsigned int Rune;     /* 32 bits */
 
 enum
 {
-       UTFmax          = 3,            /* maximum bytes per rune */
+       UTFmax          = 4,            /* maximum bytes per rune */
        Runesync        = 0x80,         /* cannot represent part of a UTF sequence (<) */
        Runeself        = 0x80,         /* rune and UTF sequences are the same (<) */
        Runeerror       = 0xFFFD,       /* decoding error in UTF */
-       Runemax         = 0xFFFF,       /* 16 bit rune */
+       Runemax         = 0x10FFFF,     /* 21 bit rune */
 };
 
 /*

diff --git a/sys/include/libc.h b/sys/include/libc.h
index a92e5680d382f0c0e71f907ce96ec5a0b66cb779..1300d46d5e1d9c7cf55d8159230ed8af6f7f0b04 100644 (file)
--- a/sys/include/libc.h
+++ b/sys/include/libc.h
@@ -41,12 +41,12 @@ extern      int     tokenize(char*, char**, int);
 
 enum
 {
-       UTFmax          = 3,            /* maximum bytes per rune */
+       UTFmax          = 4,            /* maximum bytes per rune */
        Runesync        = 0x80,         /* cannot represent part of a UTF sequence (<) */
        Runeself        = 0x80,         /* rune and UTF sequences are the same (<) */
        Runeerror       = 0xFFFD,       /* decoding error in UTF */
-       Runemax         = 0xFFFF,       /* 16 bit rune */
-       Runemask        = 0xFFFF,       /* bits used by runes (see grep) */
+       Runemax         = 0x10FFFF,     /* 21 bit rune */
+       Runemask        = 0x1FFFFF,     /* bits used by runes (see grep) */
 };
 
 /*