commit 92ca7bbb695e2e9675f1d731fa85760f95d2c0df
author Andy Balholm <andy@balholm.com> Mon Dec 14 09:57:40 2015 -0800
committer Marcel van Lohuizen <mpvl@golang.org> Mon Dec 14 20:16:19 2015 +0000
tree 9699f5894229d82ee4fbcdf9fcfb475ccb4ffa25
parent ecbd6a8c8355d94a6bd836f9671c9c7a48a5196c

encoding/charmap: don't map U+FFFD in encoder

Illegal bytes in the charmap are mapped to U+FFFD on decoding. On the
encoding side, this was resulting in a reverse entry mapping U+FFFD to
the first illegal byte in the charmap. This skips over U+FFFD when
collecting the data for the encoding tables.

Change-Id: Id7612ed6fd1aed6e0b0bdf1e68e68cb60e167135
Reviewed-on: https://go-review.googlesource.com/17764
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>

encoding/charmap/maketables.go

diff --git a/encoding/charmap/maketables.go b/encoding/charmap/maketables.go
index d382716..8e1db02 100644
--- a/encoding/charmap/maketables.go
+++ b/encoding/charmap/maketables.go
@@ -443,7 +443,7 @@
 		printf("decode: [256]utf8Enc{\n")
 		i, backMapping := 0, map[rune]byte{}
 		for _, c := range e.mapping {
-			if _, ok := backMapping[c]; !ok {
+			if _, ok := backMapping[c]; !ok && c != utf8.RuneError {
 				backMapping[c] = byte(i)
 			}
 			var buf [8]byte

encoding/charmap/tables.go

diff --git a/encoding/charmap/tables.go b/encoding/charmap/tables.go
index 5ee0635..4143f06 100644
--- a/encoding/charmap/tables.go
+++ b/encoding/charmap/tables.go
@@ -1400,10 +1400,10 @@
 		0xb600015b, 0xaa00015e, 0xba00015f, 0xa9000160, 0xb9000161, 0xde000162, 0xfe000163, 0xab000164,
 		0xbb000165, 0xd900016e, 0xf900016f, 0xdb000170, 0xfb000171, 0xac000179, 0xbc00017a, 0xaf00017b,
 		0xbf00017c, 0xae00017d, 0xbe00017e, 0xb70002c7, 0xa20002d8, 0xff0002d9, 0xb20002db, 0xbd0002dd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd,
+		0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd,
+		0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd,
+		0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd, 0xbd0002dd,
 	},
 }
 
@@ -1574,11 +1574,11 @@
 		0xe500010b, 0xd800011c, 0xf800011d, 0xab00011e, 0xbb00011f, 0xd5000120, 0xf5000121, 0xa6000124,
 		0xb6000125, 0xa1000126, 0xb1000127, 0xa9000130, 0xb9000131, 0xac000134, 0xbc000135, 0xde00015c,
 		0xfe00015d, 0xaa00015e, 0xba00015f, 0xdd00016c, 0xfd00016d, 0xaf00017b, 0xbf00017c, 0xa20002d8,
-		0xff0002d9, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9,
+		0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9,
+		0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9,
+		0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9,
+		0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9, 0xff0002d9,
 	},
 }
 
@@ -1750,10 +1750,10 @@
 		0xb600013c, 0xd1000145, 0xf1000146, 0xbd00014a, 0xbf00014b, 0xd200014c, 0xf200014d, 0xa3000156,
 		0xb3000157, 0xa9000160, 0xb9000161, 0xac000166, 0xbc000167, 0xdd000168, 0xfd000169, 0xde00016a,
 		0xfe00016b, 0xd9000172, 0xf9000173, 0xae00017d, 0xbe00017e, 0xb70002c7, 0xff0002d9, 0xb20002db,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db,
+		0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db,
+		0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db,
+		0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db, 0xb20002db,
 	},
 }
 
@@ -1925,10 +1925,10 @@
 		0xe7000447, 0xe8000448, 0xe9000449, 0xea00044a, 0xeb00044b, 0xec00044c, 0xed00044d, 0xee00044e,
 		0xef00044f, 0xf1000451, 0xf2000452, 0xf3000453, 0xf4000454, 0xf5000455, 0xf6000456, 0xf7000457,
 		0xf8000458, 0xf9000459, 0xfa00045a, 0xfb00045b, 0xfc00045c, 0xfe00045e, 0xff00045f, 0xf0002116,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116,
+		0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116,
+		0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116,
+		0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116, 0xf0002116,
 	},
 }
 
@@ -2094,16 +2094,16 @@
 		0xd3000633, 0xd4000634, 0xd5000635, 0xd6000636, 0xd7000637, 0xd8000638, 0xd9000639, 0xda00063a,
 		0xe0000640, 0xe1000641, 0xe2000642, 0xe3000643, 0xe4000644, 0xe5000645, 0xe6000646, 0xe7000647,
 		0xe8000648, 0xe9000649, 0xea00064a, 0xeb00064b, 0xec00064c, 0xed00064d, 0xee00064e, 0xef00064f,
-		0xf0000650, 0xf1000651, 0xf2000652, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xf0000650, 0xf1000651, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
+		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
+		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
+		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
+		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
+		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
+		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
+		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
+		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
+		0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652, 0xf2000652,
 	},
 }
 
@@ -2274,11 +2274,11 @@
 		0xe70003b7, 0xe80003b8, 0xe90003b9, 0xea0003ba, 0xeb0003bb, 0xec0003bc, 0xed0003bd, 0xee0003be,
 		0xef0003bf, 0xf00003c0, 0xf10003c1, 0xf20003c2, 0xf30003c3, 0xf40003c4, 0xf50003c5, 0xf60003c6,
 		0xf70003c7, 0xf80003c8, 0xf90003c9, 0xfa0003ca, 0xfb0003cb, 0xfc0003cc, 0xfd0003cd, 0xfe0003ce,
-		0xaf002015, 0xa1002018, 0xa2002019, 0xa40020ac, 0xa50020af, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xaf002015, 0xa1002018, 0xa2002019, 0xa40020ac, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af,
+		0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af,
+		0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af,
+		0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af,
+		0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af, 0xa50020af,
 	},
 }
 
@@ -2445,15 +2445,15 @@
 		0xe20005d2, 0xe30005d3, 0xe40005d4, 0xe50005d5, 0xe60005d6, 0xe70005d7, 0xe80005d8, 0xe90005d9,
 		0xea0005da, 0xeb0005db, 0xec0005dc, 0xed0005dd, 0xee0005de, 0xef0005df, 0xf00005e0, 0xf10005e1,
 		0xf20005e2, 0xf30005e3, 0xf40005e4, 0xf50005e5, 0xf60005e6, 0xf70005e7, 0xf80005e8, 0xf90005e9,
-		0xfa0005ea, 0xfd00200e, 0xfe00200f, 0xdf002017, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xfa0005ea, 0xfd00200e, 0xfe00200f, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
+		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
+		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
+		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
+		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
+		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
+		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
+		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
+		0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017, 0xdf002017,
 	},
 }
 
@@ -2625,10 +2625,10 @@
 		0xa6000136, 0xb6000137, 0xff000138, 0xa800013b, 0xb800013c, 0xd1000145, 0xf1000146, 0xaf00014a,
 		0xbf00014b, 0xd200014c, 0xf200014d, 0xaa000160, 0xba000161, 0xab000166, 0xbb000167, 0xd7000168,
 		0xf7000169, 0xae00016a, 0xbe00016b, 0xd9000172, 0xf9000173, 0xac00017d, 0xbc00017e, 0xbd002015,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015,
+		0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015,
+		0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015,
+		0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015, 0xbd002015,
 	},
 }
 
@@ -2800,10 +2800,10 @@
 		0xd2000145, 0xf2000146, 0xd400014c, 0xf400014d, 0xaa000156, 0xba000157, 0xda00015a, 0xfa00015b,
 		0xd0000160, 0xf0000161, 0xdb00016a, 0xfb00016b, 0xd8000172, 0xf8000173, 0xca000179, 0xea00017a,
 		0xdd00017b, 0xfd00017c, 0xde00017d, 0xfe00017e, 0xff002019, 0xb400201c, 0xa100201d, 0xa500201e,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e,
+		0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e,
+		0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e,
+		0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e, 0xa500201e,
 	},
 }
 
@@ -2975,10 +2975,10 @@
 		0xfe000177, 0xaf000178, 0xa1001e02, 0xa2001e03, 0xa6001e0a, 0xab001e0b, 0xb0001e1e, 0xb1001e1f,
 		0xb4001e40, 0xb5001e41, 0xb7001e56, 0xb9001e57, 0xbb001e60, 0xbf001e61, 0xd7001e6a, 0xf7001e6b,
 		0xa8001e80, 0xb8001e81, 0xaa001e82, 0xba001e83, 0xbd001e84, 0xbe001e85, 0xac001ef2, 0xbc001ef3,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3,
+		0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3,
+		0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3,
+		0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3, 0xbc001ef3,
 	},
 }
 
@@ -3150,10 +3150,10 @@
 		0xf00000f0, 0xf10000f1, 0xf20000f2, 0xf30000f3, 0xf40000f4, 0xf50000f5, 0xf60000f6, 0xf70000f7,
 		0xf80000f8, 0xf90000f9, 0xfa0000fa, 0xfb0000fb, 0xfc0000fc, 0xfd0000fd, 0xfe0000fe, 0xff0000ff,
 		0xbc000152, 0xbd000153, 0xa6000160, 0xa8000161, 0xbe000178, 0xb400017d, 0xb800017e, 0xa40020ac,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
+		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
+		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
+		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
 	},
 }
 
@@ -3325,10 +3325,10 @@
 		0xd5000150, 0xf5000151, 0xbc000152, 0xbd000153, 0xd700015a, 0xf700015b, 0xa6000160, 0xa8000161,
 		0xd8000170, 0xf8000171, 0xbe000178, 0xac000179, 0xae00017a, 0xaf00017b, 0xbf00017c, 0xb400017d,
 		0xb800017e, 0xaa000218, 0xba000219, 0xde00021a, 0xfe00021b, 0xb500201d, 0xa500201e, 0xa40020ac,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
-		0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd, 0x8000fffd,
+		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
+		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
+		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
+		0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac, 0xa40020ac,
 	},
 }
 
@@ -4200,10 +4200,10 @@
 		0xec000e4c, 0xed000e4d, 0xee000e4e, 0xef000e4f, 0xf0000e50, 0xf1000e51, 0xf2000e52, 0xf3000e53,
 		0xf4000e54, 0xf5000e55, 0xf6000e56, 0xf7000e57, 0xf8000e58, 0xf9000e59, 0xfa000e5a, 0xfb000e5b,
 		0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x9300201c, 0x9400201d, 0x95002022, 0x85002026,
-		0x800020ac, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
-		0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
-		0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
-		0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
+		0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac,
+		0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac,
+		0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac,
+		0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac, 0x800020ac,
 	},
 }
 
@@ -4378,7 +4378,7 @@
 		0x9f00017a, 0xaf00017b, 0xbf00017c, 0x8e00017d, 0x9e00017e, 0xa10002c7, 0xa20002d8, 0xff0002d9,
 		0xb20002db, 0xbd0002dd, 0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x8200201a, 0x9300201c,
 		0x9400201d, 0x8400201e, 0x86002020, 0x87002021, 0x95002022, 0x85002026, 0x89002030, 0x8b002039,
-		0x9b00203a, 0x800020ac, 0x99002122, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
+		0x9b00203a, 0x800020ac, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
 	},
 }
 
@@ -4553,7 +4553,7 @@
 		0xba000454, 0xbe000455, 0xb3000456, 0xbf000457, 0xbc000458, 0x9a000459, 0x9c00045a, 0x9e00045b,
 		0x9d00045c, 0xa200045e, 0x9f00045f, 0xa5000490, 0xb4000491, 0x96002013, 0x97002014, 0x91002018,
 		0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e, 0x86002020, 0x87002021, 0x95002022,
-		0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0x880020ac, 0xb9002116, 0x99002122, 0x9800fffd,
+		0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0x880020ac, 0xb9002116, 0x99002122, 0x99002122,
 	},
 }
 
@@ -4728,7 +4728,7 @@
 		0x8c000152, 0x9c000153, 0x8a000160, 0x9a000161, 0x9f000178, 0x8e00017d, 0x9e00017e, 0x83000192,
 		0x880002c6, 0x980002dc, 0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x8200201a, 0x9300201c,
 		0x9400201d, 0x8400201e, 0x86002020, 0x87002021, 0x95002022, 0x85002026, 0x89002030, 0x8b002039,
-		0x9b00203a, 0x800020ac, 0x99002122, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
+		0x9b00203a, 0x800020ac, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
 	},
 }
 
@@ -4901,9 +4901,9 @@
 		0xf20003c2, 0xf30003c3, 0xf40003c4, 0xf50003c5, 0xf60003c6, 0xf70003c7, 0xf80003c8, 0xf90003c9,
 		0xfa0003ca, 0xfb0003cb, 0xfc0003cc, 0xfd0003cd, 0xfe0003ce, 0x96002013, 0x97002014, 0xaf002015,
 		0x91002018, 0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e, 0x86002020, 0x87002021,
-		0x95002022, 0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0x800020ac, 0x99002122, 0x8100fffd,
-		0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
-		0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
+		0x95002022, 0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0x800020ac, 0x99002122, 0x99002122,
+		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
+		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
 	},
 }
 
@@ -5078,7 +5078,7 @@
 		0xde00015e, 0xfe00015f, 0x8a000160, 0x9a000161, 0x9f000178, 0x83000192, 0x880002c6, 0x980002dc,
 		0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e,
 		0x86002020, 0x87002021, 0x95002022, 0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0x800020ac,
-		0x99002122, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
+		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
 	},
 }
 
@@ -5251,9 +5251,9 @@
 		0xd40005f0, 0xd50005f1, 0xd60005f2, 0xd70005f3, 0xd80005f4, 0xfd00200e, 0xfe00200f, 0x96002013,
 		0x97002014, 0x91002018, 0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e, 0x86002020,
 		0x87002021, 0x95002022, 0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0xa40020aa, 0x800020ac,
-		0x99002122, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
-		0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
-		0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
+		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
+		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
+		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
 	},
 }
 
@@ -5602,8 +5602,8 @@
 		0xd8000172, 0xf8000173, 0xca000179, 0xea00017a, 0xdd00017b, 0xfd00017c, 0xde00017d, 0xfe00017e,
 		0x8e0002c7, 0xff0002d9, 0x9e0002db, 0x96002013, 0x97002014, 0x91002018, 0x92002019, 0x8200201a,
 		0x9300201c, 0x9400201d, 0x8400201e, 0x86002020, 0x87002021, 0x95002022, 0x85002026, 0x89002030,
-		0x8b002039, 0x9b00203a, 0x800020ac, 0x99002122, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
-		0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
+		0x8b002039, 0x9b00203a, 0x800020ac, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
+		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
 	},
 }
 
@@ -5777,8 +5777,8 @@
 		0x9f000178, 0x83000192, 0xd50001a0, 0xf50001a1, 0xdd0001af, 0xfd0001b0, 0x880002c6, 0x980002dc,
 		0xcc000300, 0xec000301, 0xde000303, 0xd2000309, 0xf2000323, 0x96002013, 0x97002014, 0x91002018,
 		0x92002019, 0x8200201a, 0x9300201c, 0x9400201d, 0x8400201e, 0x86002020, 0x87002021, 0x95002022,
-		0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0xfe0020ab, 0x800020ac, 0x99002122, 0x8100fffd,
-		0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd, 0x8100fffd,
+		0x85002026, 0x89002030, 0x8b002039, 0x9b00203a, 0xfe0020ab, 0x800020ac, 0x99002122, 0x99002122,
+		0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122, 0x99002122,
 	},
 }