Mercurial > sdl-ios-xcode
view src/timer/mint/SDL_vbltimer.S @ 4388:1524d3237820 SDL-1.2
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:00:57 +0000 |
parents | 5425a6fbacf8 |
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 Lesser General Public License as published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ /* * VBL queue routine * * Patrice Mandin */ #define _vbl_queue 0x456 #define _hz_200 0x4ba .text .globl _SDL_AtariVblInstall .globl _SDL_AtariVblUninstall .globl _SDL_MintAudio_hasfpu /*--- Save/restore FPU context ---*/ #if defined(__mcoldfire__) #define SAVE_FPU_CONTEXT \ lea sp@(-216),sp; \ fsave sp@; \ fmovel fpiar,sp@-; \ lea sp@(-64),sp; \ fmovemd fp0-fp7,sp@ #define RESTORE_FPU_CONTEXT \ fmovemd sp@,fp0-fp7; \ lea sp@(64),sp; \ fmovel sp@+,fpiar; \ frestore sp@; \ lea sp@(216),sp #else #define SAVE_FPU_CONTEXT \ .chip 68k/68881; \ fsave sp@-; \ fmoveml fpcr/fpsr/fpiar,sp@-; \ fmovemx fp0-fp7,sp@-; \ .chip 68k #define RESTORE_FPU_CONTEXT \ .chip 68k/68881; \ fmovemx sp@+,fp0-fp7; \ fmoveml sp@+,fpcr/fpsr/fpiar; \ frestore sp@+; \ .chip 68k #endif /*--- Vector installer ---*/ _SDL_AtariVblInstall: #if defined(__mcoldfire__) movel sp@(4),d0 movel d0,my_vector #else movel sp@(4),my_vector #endif lea _my_vbl,a0 clrw vbl_mutex #if defined(__mcoldfire__) movel _hz_200.w,d0 movel d0, _SDL_Atari_hz200 #else movel _hz_200.w, _SDL_Atari_hz200 #endif /* Stop interrupts */ movew #0x2700,sr /* Read vbl_queue pointer */ movel _vbl_queue.w,a1 /* Search a free place */ moveq #7,d0 bcl_search_place: movel (a1),d1 beqs place_found addql #4,a1 #if defined(__mcoldfire__) subql #1,d0 bpls bcl_search_place #else dbra d0,bcl_search_place #endif /* Not found */ moveq #1,d0 bras exit_vbl_queue /* Then install ourselves */ place_found: movel a0,(a1) moveq #0,d0 exit_vbl_queue: /* Restart interrupts */ movew #0x2300,sr rts /*--- Vector uninstaller ---*/ _SDL_AtariVblUninstall: movel sp@(4),d0 cmpl my_vector,d0 bnes badvector movel #_my_vbl,d0 /* Stop interrupts */ movew #0x2700,sr /* Read vbl_queue pointer */ movel _vbl_queue.w,a1 /* Search where we are */ moveq #7,d1 bcl2_search_place: cmpl (a1),d0 bnes next_place clrl (a1) moveq #0,d1 next_place: addql #4,a1 #if defined(__mcoldfire__) subql #1,d1 bpls bcl_search_place #else dbra d1,bcl2_search_place #endif /* Restart interrupts */ movew #0x2300,sr badvector: rts /*--- Our vbl ---*/ _my_vbl: #if defined(__mcoldfire__) lea sp@(-60),sp moveml d0-d7/a0-a6,sp@ #else moveml d0-d7/a0-a6,sp@- #endif /* Update _hz_200 */ #if defined(__mcoldfire__) movel _hz_200.w,d0 movel d0, _SDL_Atari_hz200 #else movel _hz_200.w, _SDL_Atari_hz200 #endif /* Verify if this is not already running */ tstw vbl_mutex bnes vbl_end #if defined(__mcoldfire__) movew vbl_mutex,d0 notl d0 movew d0,vbl_mutex #else notw vbl_mutex #endif /* Save FPU if needed */ tstw _SDL_MintAudio_hasfpu beqs SDL_AtariVbl_nofpu1 SAVE_FPU_CONTEXT SDL_AtariVbl_nofpu1: movel my_vector,a0 jsr a0@ /* Restore FPU if needed */ tstw _SDL_MintAudio_hasfpu beqs SDL_AtariVbl_Xbios_nofpu2 RESTORE_FPU_CONTEXT SDL_AtariVbl_Xbios_nofpu2: clrw vbl_mutex vbl_end: #if defined(__mcoldfire__) moveml sp@,d0-d7/a0-a6 lea sp@(60),sp #else moveml sp@+,d0-d7/a0-a6 #endif rts .data .even .comm _SDL_Atari_hz200,4*1 .even .comm vbl_mutex,2*1 .even .comm my_vector,4*1