Mercurial > sdl-ios-xcode
view src/video/riscos/SDL_riscosASM.S @ 3539:f2846bf19360
Fixed bug #896
John Popplewell 2009-12-08 23:05:50 PST
Originally reported by AKFoerster on the mailing list.
Error decoding UTF8 Russian text to UTF-16LE on Windows, but specifically on
platforms without iconv support (the default on Windows).
Valid UTF8 characters are flagged as being overlong and then substituted by the
UNKNOWN_UNICODE character.
After studying the testiconv.c example program, reading the RFCs and putting
some printf statements in SDL_iconv.c the problem is in a test for 'Maximum
overlong sequences', specifically 4.2.1, which is carried out by the following
code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xCE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
Here is the 2-byte encoding of a character in range 00000080 - 000007FF
110xxxxx 10xxxxxx
The line in question is supposed to be checking for an overlong sequence which
would be less than
11000001 10111111
which should be represented as a single byte.
BUT, the mask value (0xCE) is wrong, it isn't checking the top-most bit:
11000001 value
11001110 mask (incorrect)
^
and should be (0xDE):
11000001 value
11011110 mask (correct)
making the above code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xDE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
I can supply a test program and/or a patch if required,
best regards,
John Popplewell
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 11 Dec 2009 08:03:43 +0000 |
parents | 99210400e8b9 |
children |
line wrap: on
line source
; ; SDL - Simple DirectMedia Layer ; Copyright (C) 1997-2009 Sam Lantinga ; ; This library is free software; you can redistribute it and/or ; modify it under the terms of the GNU Library General Public ; License as published by the Free Software Foundation; either ; version 2 of the License, or (at your option) any later version. ; ; This library is distributed in the hope that it will be useful, ; but WITHOUT ANY WARRANTY; without even the implied warranty of ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ; Library General Public License for more details. ; ; You should have received a copy of the GNU Library General Public ; License along with this library; if not, write to the Free ; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; ; Sam Lantinga ; slouken@libsdl.org ; ; Assembler routines for RISC OS display ; AREA |C$$CODE| EXPORT |RISCOS_Put32| ; Display 32bpp to 32bpp, 1:1 ; ; Code provided by Adrain Lees ; ; entry a1 -> destination ; a2 = dest width in pixels ; a3 = dest line length in bytes ; a4 = dest height in scanlines ; arg5 -> source ; arg6 = byte offset from end of source line to start of next Arg5 * 10*4 Arg6 * Arg5+4 RISCOS_Put32 ROUT STMFD sp!,{a2,v1-v6,sl,fp,lr} LDR ip,[sp,#Arg5] MOV lr,a1 B ucp64lp 00 ;tail strip of 1-15 pixels LDR v1,[ip],#4 01 SUBS a2,a2,#1 STR v1,[lr],#4 LDRHI v1,[ip],#4 BHI %01 B %02 ucp64end ADDS a2,a2,#16 BNE %00 02 SUBS a4,a4,#1 ;height-- LDRHI v1,[sp,#Arg6] LDRHI a2,[sp] ;reload width BLS %03 ;move to start of next scanline ADD lr,a1,a3 ADD a1,a1,a3 ADD ip,ip,v1 ucp64lp SUBS a2,a2,#16 BLO ucp64end PLD [ip,#64] LDR v1,[ip],#4 LDR v2,[ip],#4 LDR v3,[ip],#4 LDR v4,[ip],#4 LDR v5,[ip],#4 LDR v6,[ip],#4 LDR sl,[ip],#4 LDR fp,[ip],#4 STR v1,[lr],#4 STR v2,[lr],#4 STR v3,[lr],#4 STR v4,[lr],#4 STR v5,[lr],#4 STR v6,[lr],#4 STR sl,[lr],#4 STR fp,[lr],#4 PLD [ip,#64] LDR v1,[ip],#4 LDR v2,[ip],#4 LDR v3,[ip],#4 LDR v4,[ip],#4 LDR v5,[ip],#4 LDR v6,[ip],#4 LDR sl,[ip],#4 LDR fp,[ip],#4 STR v1,[lr],#4 STR v2,[lr],#4 STR v3,[lr],#4 STR v4,[lr],#4 STR v5,[lr],#4 STR v6,[lr],#4 STR sl,[lr],#4 STR fp,[lr],#4 B ucp64lp 03 LDMFD sp!,{a2,v1-v6,sl,fp,pc}