ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
rogerman 2016-11-27 20:57:09 -08:00
parent b57f2dec12 425ddecb8b
commit 2f98c8b545
23 changed files with 1079 additions and 2211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desmume/src/NDSSystem.cpp
View File

@ -44,7 +44,6 @@
#include "debug.h" #include "debug.h"
#include "cheatSystem.h" #include "cheatSystem.h"
#include "movie.h" #include "movie.h"
#include "Disassembler.h"
#include "FIFO.h" #include "FIFO.h"
#include "readwrite.h" #include "readwrite.h"
#include "registers.h" #include "registers.h"

1
desmume/src/arm_jit.cpp
View File

@ -38,7 +38,6 @@
#include "armcpu.h" #include "armcpu.h"
#include "instructions.h" #include "instructions.h"
#include "instruction_attributes.h" #include "instruction_attributes.h"
#include "Disassembler.h"
#include "MMU.h" #include "MMU.h"
#include "MMU_timing.h" #include "MMU_timing.h"
#include "arm_jit.h" #include "arm_jit.h"

1
desmume/src/armcpu.cpp
View File

@ -26,7 +26,6 @@
#include "cp15.h" #include "cp15.h"
#include "bios.h" #include "bios.h"
#include "debug.h" #include "debug.h"
#include "Disassembler.h"
#include "NDSSystem.h" #include "NDSSystem.h"
#include "MMU_timing.h" #include "MMU_timing.h"
#include "utils/bits.h" #include "utils/bits.h"

0
desmume/src/Disassembler.cpp → desmume/src/frontend/modules/Disassembler.cpp
View File

0
desmume/src/Disassembler.h → desmume/src/frontend/modules/Disassembler.h
View File

7
desmume/src/frontend/posix/Makefile.am
View File

@ -29,7 +29,7 @@ libdesmume_a_SOURCES = \
../../common.cpp ../../common.h \ ../../common.cpp ../../common.h \
../../debug.cpp ../../debug.h \ ../../debug.cpp ../../debug.h \
../../driver.cpp ../../driver.h \ ../../driver.cpp ../../driver.h \
../../Database.cpp ../../Database.h ../../Disassembler.cpp ../../Disassembler.h \ ../../Database.cpp ../../Database.h \
../../emufile.h ../../emufile.cpp ../../encrypt.h ../../encrypt.cpp ../../FIFO.cpp ../../FIFO.h \ ../../emufile.h ../../emufile.cpp ../../encrypt.h ../../encrypt.cpp ../../FIFO.cpp ../../FIFO.h \
../../firmware.cpp ../../firmware.h ../../GPU.cpp ../../GPU.h \ ../../firmware.cpp ../../firmware.h ../../GPU.cpp ../../GPU.h \
../../GPU_osd.h \ ../../GPU_osd.h \
@ -53,12 +53,13 @@ libdesmume_a_SOURCES = \
../../thumb_instructions.cpp ../../types.h \ ../../thumb_instructions.cpp ../../types.h \
../../movie.cpp ../../movie.h \ ../../movie.cpp ../../movie.h \
../../PACKED.h ../../PACKED_END.h \ ../../PACKED.h ../../PACKED_END.h \
../../frontend/modules/Disassembler.cpp ../../frontend/modules/Disassembler.h \
../../utils/advanscene.cpp ../../utils/advanscene.h \ ../../utils/advanscene.cpp ../../utils/advanscene.h \
../../utils/datetime.cpp ../../utils/datetime.h \ ../../utils/datetime.cpp ../../utils/datetime.h \
../../utils/ConvertUTF.c ../../utils/ConvertUTF.h ../../utils/guid.cpp ../../utils/guid.h \ ../../utils/guid.cpp ../../utils/guid.h \
../../utils/emufat.cpp ../../utils/emufat.h utils/emufat_types.h \ ../../utils/emufat.cpp ../../utils/emufat.h utils/emufat_types.h \
../../utils/fsnitro.cpp ../../utils/fsnitro.h \ ../../utils/fsnitro.cpp ../../utils/fsnitro.h \
../../utils/md5.cpp ../../utils/md5.h utils/valuearray.h ../../utils/xstring.cpp ../../utils/xstring.h \ ../../utils/xstring.cpp ../../utils/xstring.h \
../../utils/decrypt/crc.cpp ../../utils/decrypt/crc.h ../../utils/decrypt/decrypt.cpp \ ../../utils/decrypt/crc.cpp ../../utils/decrypt/crc.h ../../utils/decrypt/decrypt.cpp \
../../utils/decrypt/decrypt.h ../../utils/decrypt/header.cpp ../../utils/decrypt/header.h \ ../../utils/decrypt/decrypt.h ../../utils/decrypt/header.cpp ../../utils/decrypt/header.h \
../../utils/task.cpp ../../utils/task.h \ ../../utils/task.cpp ../../utils/task.h \

156
desmume/src/frontend/windows/DeSmuME.vcxproj
View File

@ -80,7 +80,6 @@
<ClCompile Include="..\..\cp15.cpp" /> <ClCompile Include="..\..\cp15.cpp" />
<ClCompile Include="..\..\Database.cpp" /> <ClCompile Include="..\..\Database.cpp" />
<ClCompile Include="..\..\debug.cpp" /> <ClCompile Include="..\..\debug.cpp" />
<ClCompile Include="..\..\Disassembler.cpp" />
<ClCompile Include="..\..\driver.cpp" /> <ClCompile Include="..\..\driver.cpp" />
<ClCompile Include="..\..\emufile.cpp" /> <ClCompile Include="..\..\emufile.cpp" />
<ClCompile Include="..\..\encrypt.cpp" /> <ClCompile Include="..\..\encrypt.cpp" />
@ -104,6 +103,7 @@
<ClCompile Include="..\..\libretro-common\compat\compat_snprintf.c" /> <ClCompile Include="..\..\libretro-common\compat\compat_snprintf.c" />
<ClCompile Include="..\..\libretro-common\compat\compat_strcasestr.c" /> <ClCompile Include="..\..\libretro-common\compat\compat_strcasestr.c" />
<ClCompile Include="..\..\libretro-common\compat\compat_strl.c" /> <ClCompile Include="..\..\libretro-common\compat\compat_strl.c" />
<ClCompile Include="..\..\libretro-common\encodings\encoding_utf.c" />
<ClCompile Include="..\..\libretro-common\features\features_cpu.c" /> <ClCompile Include="..\..\libretro-common\features\features_cpu.c" />
<ClCompile Include="..\..\libretro-common\file\archive_file.c" /> <ClCompile Include="..\..\libretro-common\file\archive_file.c" />
<ClCompile Include="..\..\libretro-common\file\archive_file_zlib.c" /> <ClCompile Include="..\..\libretro-common\file\archive_file_zlib.c" />
@ -201,9 +201,7 @@
<ClCompile Include="..\..\addons\slot2_none.cpp" /> <ClCompile Include="..\..\addons\slot2_none.cpp" />
<ClCompile Include="..\..\addons\slot2_rumblepak.cpp" /> <ClCompile Include="..\..\addons\slot2_rumblepak.cpp" />
<ClCompile Include="..\..\gdbstub\gdbstub.cpp" /> <ClCompile Include="..\..\gdbstub\gdbstub.cpp" />
<ClCompile Include="..\..\utils\ConvertUTF.c" />
<ClCompile Include="..\..\utils\guid.cpp" /> <ClCompile Include="..\..\utils\guid.cpp" />
<ClCompile Include="..\..\utils\md5.cpp" />
<ClCompile Include="..\..\utils\task.cpp" /> <ClCompile Include="..\..\utils\task.cpp" />
<ClCompile Include="..\..\utils\xstring.cpp" /> <ClCompile Include="..\..\utils\xstring.cpp" />
<ClCompile Include="..\..\utils\decrypt\crc.cpp" /> <ClCompile Include="..\..\utils\decrypt\crc.cpp" />
@ -224,6 +222,7 @@
<ClCompile Include="..\..\metaspu\SoundTouch\sse_optimized.cpp" /> <ClCompile Include="..\..\metaspu\SoundTouch\sse_optimized.cpp" />
<ClCompile Include="..\..\metaspu\SoundTouch\TDStretch.cpp" /> <ClCompile Include="..\..\metaspu\SoundTouch\TDStretch.cpp" />
<ClCompile Include="..\..\metaspu\SoundTouch\WavFile.cpp" /> <ClCompile Include="..\..\metaspu\SoundTouch\WavFile.cpp" />
<ClCompile Include="..\modules\Disassembler.cpp" />
<ClCompile Include="..\modules\osd\agg\aggdraw.cpp" /> <ClCompile Include="..\modules\osd\agg\aggdraw.cpp" />
<ClCompile Include="..\modules\osd\agg\agg_osd.cpp" /> <ClCompile Include="..\modules\osd\agg\agg_osd.cpp" />
<ClCompile Include="AboutBox.cpp" /> <ClCompile Include="AboutBox.cpp" />
@ -344,9 +343,12 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\Database.h" /> <ClInclude Include="..\..\Database.h" />
<ClInclude Include="..\..\libretro-common\include\encodings\utf.h" />
<ClInclude Include="..\..\libretro-common\include\features\features_cpu.h" /> <ClInclude Include="..\..\libretro-common\include\features\features_cpu.h" />
<ClInclude Include="..\..\libretro-common\include\libretro.h" />
<ClInclude Include="..\..\types.h" /> <ClInclude Include="..\..\types.h" />
<ClInclude Include="..\..\utils\xstring.h" /> <ClInclude Include="..\..\utils\xstring.h" />
<ClInclude Include="..\..\version.h" />
<ClInclude Include="..\addons\slot1comp_mc.h" /> <ClInclude Include="..\addons\slot1comp_mc.h" />
<ClInclude Include="..\addons\slot1comp_protocol.h" /> <ClInclude Include="..\addons\slot1comp_protocol.h" />
<ClInclude Include="..\addons\slot1comp_rom.h" /> <ClInclude Include="..\addons\slot1comp_rom.h" />
@ -359,7 +361,6 @@
<ClInclude Include="..\common.h" /> <ClInclude Include="..\common.h" />
<ClInclude Include="..\cp15.h" /> <ClInclude Include="..\cp15.h" />
<ClInclude Include="..\debug.h" /> <ClInclude Include="..\debug.h" />
<ClInclude Include="..\Disassembler.h" />
<ClInclude Include="..\driver.h" /> <ClInclude Include="..\driver.h" />
<ClInclude Include="..\emufile.h" /> <ClInclude Include="..\emufile.h" />
<ClInclude Include="..\encrypt.h" /> <ClInclude Include="..\encrypt.h" />
@ -392,6 +393,7 @@
<ClInclude Include="..\mic.h" /> <ClInclude Include="..\mic.h" />
<ClInclude Include="..\MMU.h" /> <ClInclude Include="..\MMU.h" />
<ClInclude Include="..\MMU_timing.h" /> <ClInclude Include="..\MMU_timing.h" />
<ClInclude Include="..\modules\Disassembler.h" />
<ClInclude Include="..\modules\osd\agg\agg2d.h" /> <ClInclude Include="..\modules\osd\agg\agg2d.h" />
<ClInclude Include="..\modules\osd\agg\aggdraw.h" /> <ClInclude Include="..\modules\osd\agg\aggdraw.h" />
<ClInclude Include="..\modules\osd\agg\agg_osd.h" /> <ClInclude Include="..\modules\osd\agg\agg_osd.h" />
@ -411,82 +413,78 @@
<ClInclude Include="..\slot2.h" /> <ClInclude Include="..\slot2.h" />
<ClInclude Include="..\SPU.h" /> <ClInclude Include="..\SPU.h" />
<ClInclude Include="..\texcache.h" /> <ClInclude Include="..\texcache.h" />
<ClInclude Include="..\utils\advanscene.h" /> <ClInclude Include="..\..\utils\advanscene.h" />
<ClInclude Include="..\utils\AsmJit\asmjit.h" /> <ClInclude Include="..\..\utils\AsmJit\asmjit.h" />
<ClInclude Include="..\utils\AsmJit\config.h" /> <ClInclude Include="..\..\utils\AsmJit\config.h" />
<ClInclude Include="..\utils\AsmJit\core.h" /> <ClInclude Include="..\..\utils\AsmJit\core.h" />
<ClInclude Include="..\utils\AsmJit\core\apibegin.h" /> <ClInclude Include="..\..\utils\AsmJit\core\apibegin.h" />
<ClInclude Include="..\utils\AsmJit\core\apiend.h" /> <ClInclude Include="..\..\utils\AsmJit\core\apiend.h" />
<ClInclude Include="..\utils\AsmJit\core\assembler.h" /> <ClInclude Include="..\..\utils\AsmJit\core\assembler.h" />
<ClInclude Include="..\utils\AsmJit\core\assert.h" /> <ClInclude Include="..\..\utils\AsmJit\core\assert.h" />
<ClInclude Include="..\utils\AsmJit\core\buffer.h" /> <ClInclude Include="..\..\utils\AsmJit\core\buffer.h" />
<ClInclude Include="..\utils\AsmJit\core\build.h" /> <ClInclude Include="..\..\utils\AsmJit\core\build.h" />
<ClInclude Include="..\utils\AsmJit\core\compiler.h" /> <ClInclude Include="..\..\utils\AsmJit\core\compiler.h" />
<ClInclude Include="..\utils\AsmJit\core\compilercontext.h" /> <ClInclude Include="..\..\utils\AsmJit\core\compilercontext.h" />
<ClInclude Include="..\utils\AsmJit\core\compilerfunc.h" /> <ClInclude Include="..\..\utils\AsmJit\core\compilerfunc.h" />
<ClInclude Include="..\utils\AsmJit\core\compileritem.h" /> <ClInclude Include="..\..\utils\AsmJit\core\compileritem.h" />
<ClInclude Include="..\utils\AsmJit\core\context.h" /> <ClInclude Include="..\..\utils\AsmJit\core\context.h" />
<ClInclude Include="..\utils\AsmJit\core\cpuinfo.h" /> <ClInclude Include="..\..\utils\AsmJit\core\cpuinfo.h" />
<ClInclude Include="..\utils\AsmJit\core\defs.h" /> <ClInclude Include="..\..\utils\AsmJit\core\defs.h" />
<ClInclude Include="..\utils\AsmJit\core\func.h" /> <ClInclude Include="..\..\utils\AsmJit\core\func.h" />
<ClInclude Include="..\utils\AsmJit\core\intutil.h" /> <ClInclude Include="..\..\utils\AsmJit\core\intutil.h" />
<ClInclude Include="..\utils\AsmJit\core\lock.h" /> <ClInclude Include="..\..\utils\AsmJit\core\lock.h" />
<ClInclude Include="..\utils\AsmJit\core\logger.h" /> <ClInclude Include="..\..\utils\AsmJit\core\logger.h" />
<ClInclude Include="..\utils\AsmJit\core\memorymanager.h" /> <ClInclude Include="..\..\utils\AsmJit\core\memorymanager.h" />
<ClInclude Include="..\utils\AsmJit\core\memorymarker.h" /> <ClInclude Include="..\..\utils\AsmJit\core\memorymarker.h" />
<ClInclude Include="..\utils\AsmJit\core\operand.h" /> <ClInclude Include="..\..\utils\AsmJit\core\operand.h" />
<ClInclude Include="..\utils\AsmJit\core\podvector.h" /> <ClInclude Include="..\..\utils\AsmJit\core\podvector.h" />
<ClInclude Include="..\utils\AsmJit\core\stringbuilder.h" /> <ClInclude Include="..\..\utils\AsmJit\core\stringbuilder.h" />
<ClInclude Include="..\utils\AsmJit\core\stringutil.h" /> <ClInclude Include="..\..\utils\AsmJit\core\stringutil.h" />
<ClInclude Include="..\utils\AsmJit\core\virtualmemory.h" /> <ClInclude Include="..\..\utils\AsmJit\core\virtualmemory.h" />
<ClInclude Include="..\utils\AsmJit\core\zonememory.h" /> <ClInclude Include="..\..\utils\AsmJit\core\zonememory.h" />
<ClInclude Include="..\utils\AsmJit\x86.h" /> <ClInclude Include="..\..\utils\AsmJit\x86.h" />
<ClInclude Include="..\utils\AsmJit\x86\x86assembler.h" /> <ClInclude Include="..\..\utils\AsmJit\x86\x86assembler.h" />
<ClInclude Include="..\utils\AsmJit\x86\x86compiler.h" /> <ClInclude Include="..\..\utils\AsmJit\x86\x86compiler.h" />
<ClInclude Include="..\utils\AsmJit\x86\x86compilercontext.h" /> <ClInclude Include="..\..\utils\AsmJit\x86\x86compilercontext.h" />
<ClInclude Include="..\utils\AsmJit\x86\x86compilerfunc.h" /> <ClInclude Include="..\..\utils\AsmJit\x86\x86compilerfunc.h" />
<ClInclude Include="..\utils\AsmJit\x86\x86compileritem.h" /> <ClInclude Include="..\..\utils\AsmJit\x86\x86compileritem.h" />
<ClInclude Include="..\utils\AsmJit\x86\x86cpuinfo.h" /> <ClInclude Include="..\..\utils\AsmJit\x86\x86cpuinfo.h" />
<ClInclude Include="..\utils\AsmJit\x86\x86defs.h" /> <ClInclude Include="..\..\utils\AsmJit\x86\x86defs.h" />
<ClInclude Include="..\utils\AsmJit\x86\x86func.h" /> <ClInclude Include="..\..\utils\AsmJit\x86\x86func.h" />
<ClInclude Include="..\utils\AsmJit\x86\x86operand.h" /> <ClInclude Include="..\..\utils\AsmJit\x86\x86operand.h" />
<ClInclude Include="..\utils\AsmJit\x86\x86util.h" /> <ClInclude Include="..\..\utils\AsmJit\x86\x86util.h" />
<ClInclude Include="..\utils\colorspacehandler\colorspacehandler.h" /> <ClInclude Include="..\..\utils\colorspacehandler\colorspacehandler.h" />
<ClInclude Include="..\utils\datetime.h" /> <ClInclude Include="..\..\utils\datetime.h" />
<ClInclude Include="..\utils\emufat.h" /> <ClInclude Include="..\..\utils\emufat.h" />
<ClInclude Include="..\utils\emufat_types.h" /> <ClInclude Include="..\..\utils\emufat_types.h" />
<ClInclude Include="..\utils\fsnitro.h" /> <ClInclude Include="..\..\utils\fsnitro.h" />
<ClInclude Include="..\utils\libfat\bit_ops.h" /> <ClInclude Include="..\..\utils\libfat\bit_ops.h" />
<ClInclude Include="..\utils\libfat\cache.h" /> <ClInclude Include="..\..\utils\libfat\cache.h" />
<ClInclude Include="..\utils\libfat\common.h" /> <ClInclude Include="..\..\utils\libfat\common.h" />
<ClInclude Include="..\utils\libfat\directory.h" /> <ClInclude Include="..\..\utils\libfat\directory.h" />
<ClInclude Include="..\utils\libfat\disc.h" /> <ClInclude Include="..\..\utils\libfat\disc.h" />
<ClInclude Include="..\utils\libfat\disc_io.h" /> <ClInclude Include="..\..\utils\libfat\disc_io.h" />
<ClInclude Include="..\utils\libfat\fat.h" /> <ClInclude Include="..\..\utils\libfat\fat.h" />
<ClInclude Include="..\utils\libfat\fatdir.h" /> <ClInclude Include="..\..\utils\libfat\fatdir.h" />
<ClInclude Include="..\utils\libfat\fatfile.h" /> <ClInclude Include="..\..\utils\libfat\fatfile.h" />
<ClInclude Include="..\utils\libfat\filetime.h" /> <ClInclude Include="..\..\utils\libfat\filetime.h" />
<ClInclude Include="..\utils\libfat\file_allocation_table.h" /> <ClInclude Include="..\..\utils\libfat\file_allocation_table.h" />
<ClInclude Include="..\utils\libfat\libfat_pc.h" /> <ClInclude Include="..\..\utils\libfat\libfat_pc.h" />
<ClInclude Include="..\utils\libfat\libfat_public_api.h" /> <ClInclude Include="..\..\utils\libfat\libfat_public_api.h" />
<ClInclude Include="..\utils\libfat\lock.h" /> <ClInclude Include="..\..\utils\libfat\lock.h" />
<ClInclude Include="..\utils\libfat\mem_allocate.h" /> <ClInclude Include="..\..\utils\libfat\mem_allocate.h" />
<ClInclude Include="..\utils\libfat\partition.h" /> <ClInclude Include="..\..\utils\libfat\partition.h" />
<ClInclude Include="..\utils\tinyxml\tinystr.h" /> <ClInclude Include="..\..\utils\tinyxml\tinystr.h" />
<ClInclude Include="..\utils\tinyxml\tinyxml.h" /> <ClInclude Include="..\..\utils\tinyxml\tinyxml.h" />
<ClInclude Include="..\utils\vfat.h" /> <ClInclude Include="..\..\utils\vfat.h" />
<ClInclude Include="..\version.h" />
<ClInclude Include="..\wifi.h" /> <ClInclude Include="..\wifi.h" />
<ClInclude Include="..\utils\xstring.h" /> <ClInclude Include="..\..\utils\xstring.h" />
<ClInclude Include="..\gdbstub.h" /> <ClInclude Include="..\gdbstub.h" />
<ClInclude Include="..\utils\ConvertUTF.h" /> <ClInclude Include="..\..\utils\guid.h" />
<ClInclude Include="..\utils\guid.h" /> <ClInclude Include="..\..\utils\task.h" />
<ClInclude Include="..\utils\md5.h" /> <ClInclude Include="..\..\utils\decrypt\crc.h" />
<ClInclude Include="..\utils\task.h" /> <ClInclude Include="..\..\utils\decrypt\decrypt.h" />
<ClInclude Include="..\utils\valuearray.h" /> <ClInclude Include="..\..\utils\decrypt\header.h" />
<ClInclude Include="..\utils\decrypt\crc.h" />
<ClInclude Include="..\utils\decrypt\decrypt.h" />
<ClInclude Include="..\utils\decrypt\header.h" />
<ClInclude Include="..\metaspu\metaspu.h" /> <ClInclude Include="..\metaspu\metaspu.h" />
<ClInclude Include="..\metaspu\SndOut.h" /> <ClInclude Include="..\metaspu\SndOut.h" />
<ClInclude Include="..\metaspu\win32\Dialogs.h" /> <ClInclude Include="..\metaspu\win32\Dialogs.h" />
@ -612,7 +610,7 @@
<None Include="..\instruction_tabdef.inc" /> <None Include="..\instruction_tabdef.inc" />
<None Include="..\modules\osd\agg\agg2d.inl" /> <None Include="..\modules\osd\agg\agg2d.inl" />
<None Include="..\thumb_tabdef.inc" /> <None Include="..\thumb_tabdef.inc" />
<None Include="..\utils\AsmJit\COPYING.txt" /> <None Include="..\..\utils\AsmJit\COPYING.txt" />
<None Include="bitmap1.bmp" /> <None Include="bitmap1.bmp" />
<None Include="bitmaps\FileBinary.ico" /> <None Include="bitmaps\FileBinary.ico" />
<None Include="bitmaps\FolderClosed.ico" /> <None Include="bitmaps\FolderClosed.ico" />

1733
desmume/src/frontend/windows/DeSmuME.vcxproj.filters
View File

File diff suppressed because it is too large Load Diff

2
desmume/src/frontend/windows/disView.cpp
View File

@ -24,7 +24,7 @@
#include <stdio.h> #include <stdio.h>
#include "MMU.h" #include "MMU.h"
#include "Disassembler.h" #include "frontend/modules/Disassembler.h"
#include "NDSSystem.h" #include "NDSSystem.h"
#include "armcpu.h" #include "armcpu.h"

96
desmume/src/libretro-common/encodings/encoding_utf.c
View File

@ -1,7 +1,7 @@
/* Copyright (C) 2010-2016 The RetroArch team /* Copyright (C) 2010-2016 The RetroArch team
* *
* --------------------------------------------------------------------------------------- * ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (encodings_utf.c). * The following license statement only applies to this file (encoding_utf.c).
* --------------------------------------------------------------------------------------- * ---------------------------------------------------------------------------------------
* *
* Permission is hereby granted, free of charge, * Permission is hereby granted, free of charge,
@ -21,6 +21,7 @@
*/ */
#include <stdint.h> #include <stdint.h>
#include <stdlib.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
@ -40,7 +41,7 @@ static INLINE unsigned leading_ones(uint8_t c)
return ones; return ones;
} }
/* Simple implementation. Assumes the sequence is /* Simple implementation. Assumes the sequence is
* properly synchronized and terminated. */ * properly synchronized and terminated. */
size_t utf8_conv_utf32(uint32_t *out, size_t out_chars, size_t utf8_conv_utf32(uint32_t *out, size_t out_chars,
@ -119,14 +120,14 @@ bool utf16_conv_utf8(uint8_t *out, size_t *out_chars,
if (value < (((uint32_t)1) << (numAdds * 5 + 6))) if (value < (((uint32_t)1) << (numAdds * 5 + 6)))
break; break;
if (out) if (out)
out[out_pos] = (char)(kUtf8Limits[numAdds - 1] out[out_pos] = (char)(kUtf8Limits[numAdds - 1]
+ (value >> (6 * numAdds))); + (value >> (6 * numAdds)));
out_pos++; out_pos++;
do do
{ {
numAdds--; numAdds--;
if (out) if (out)
out[out_pos] = (char)(0x80 out[out_pos] = (char)(0x80
+ ((value >> (6 * numAdds)) & 0x3F)); + ((value >> (6 * numAdds)) & 0x3F));
out_pos++; out_pos++;
}while (numAdds != 0); }while (numAdds != 0);
@ -136,21 +137,18 @@ bool utf16_conv_utf8(uint8_t *out, size_t *out_chars,
return false; return false;
} }
/* Acts mostly like strlcpy. /* Acts mostly like strlcpy.
* *
* Copies the given number of UTF-8 characters, * Copies the given number of UTF-8 characters,
* but at most d_len bytes. * but at most d_len bytes.
* *
* Always NULL terminates. * Always NULL terminates.
* Does not copy half a character. * Does not copy half a character.
* *
* Returns number of bytes. 's' is assumed valid UTF-8. * Returns number of bytes. 's' is assumed valid UTF-8.
* Use only if 'chars' is considerably less than 'd_len'. */ * Use only if 'chars' is considerably less than 'd_len'. */
size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars) size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars)
{ {
#ifdef HAVE_UTF8
char *d_org = d;
char *d_end = d+d_len;
const uint8_t *sb = (const uint8_t*)s; const uint8_t *sb = (const uint8_t*)s;
const uint8_t *sb_org = sb; const uint8_t *sb_org = sb;
@ -160,7 +158,7 @@ size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars)
while ((*sb&0xC0) == 0x80) sb++; while ((*sb&0xC0) == 0x80) sb++;
} }
if (sb - sb_org > d_len-1 /* NUL */) if ((size_t)(sb - sb_org) > d_len-1 /* NUL */)
{ {
sb = sb_org + d_len-1; sb = sb_org + d_len-1;
while ((*sb&0xC0) == 0x80) sb--; while ((*sb&0xC0) == 0x80) sb--;
@ -170,14 +168,10 @@ size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars)
d[sb-sb_org] = '\0'; d[sb-sb_org] = '\0';
return sb-sb_org; return sb-sb_org;
#else
return strlcpy(d, s, chars + 1);
#endif
} }
const char *utf8skip(const char *str, size_t chars) const char *utf8skip(const char *str, size_t chars)
{ {
#ifdef HAVE_UTF8
const uint8_t *strb = (const uint8_t*)str; const uint8_t *strb = (const uint8_t*)str;
if (!chars) if (!chars)
return str; return str;
@ -188,14 +182,10 @@ const char *utf8skip(const char *str, size_t chars)
chars--; chars--;
} while(chars); } while(chars);
return (const char*)strb; return (const char*)strb;
#else
return str + chars;
#endif
} }
size_t utf8len(const char *string) size_t utf8len(const char *string)
{ {
#ifdef HAVE_UTF8
size_t ret = 0; size_t ret = 0;
while (*string) while (*string)
{ {
@ -204,7 +194,67 @@ size_t utf8len(const char *string)
string++; string++;
} }
return ret; return ret;
#else }
return strlen(string);
#endif static INLINE uint8_t utf8_walkbyte(const char **string)
{
return *((*string)++);
}
/* Does not validate the input, returns garbage if it's not UTF-8. */
uint32_t utf8_walk(const char **string)
{
uint8_t first = utf8_walkbyte(string);
uint32_t ret;
if (first<128)
return first;
ret = 0;
ret = (ret<<6) | (utf8_walkbyte(string) & 0x3F);
if (first >= 0xE0)
ret = (ret<<6) | (utf8_walkbyte(string) & 0x3F);
if (first >= 0xF0)
ret = (ret<<6) | (utf8_walkbyte(string) & 0x3F);
if (first >= 0xF0)
return ret | (first&31)<<18;
if (first >= 0xE0)
return ret | (first&15)<<12;
return ret | (first&7)<<6;
}
static bool utf16_to_char(uint8_t **utf_data,
size_t *dest_len, const uint16_t *in)
{
unsigned len = 0;
while (in[len] != '\0')
len++;
utf16_conv_utf8(NULL, dest_len, in, len);
*dest_len += 1;
*utf_data = (uint8_t*)malloc(*dest_len);
if (*utf_data == 0)
return false;
return utf16_conv_utf8(*utf_data, dest_len, in, len);
}
bool utf16_to_char_string(const uint16_t *in, char *s, size_t len)
{
size_t dest_len = 0;
uint8_t *utf16_data = NULL;
bool ret = utf16_to_char(&utf16_data, &dest_len, in);
if (ret)
{
utf16_data[dest_len] = 0;
strlcpy(s, (const char*)utf16_data, len);
}
free(utf16_data);
utf16_data = NULL;
return ret;
} }

63
desmume/src/libretro-common/features/features_cpu.c
View File

@ -73,6 +73,16 @@
#include <ogc/lwp_watchdog.h> #include <ogc/lwp_watchdog.h>
#endif #endif
#ifdef WIIU
#include <coreinit/time.h>
#include "wiiu/system/wiiu.h"
#endif
#if defined(_3DS)
#include <3ds/svc.h>
#include <3ds/os.h>
#endif
/* iOS/OSX specific. Lacks clock_gettime(), so implement it. */ /* iOS/OSX specific. Lacks clock_gettime(), so implement it. */
#ifdef __MACH__ #ifdef __MACH__
#include <sys/time.h> #include <sys/time.h>
@ -85,9 +95,8 @@
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#endif #endif
#if (__MAC_OS_X_VERSION_MAX_ALLOWED < 101200) && (__IPHONE_OS_VERSION_MAX_ALLOWED < 100000) /* this function is part of iOS 10 now */
// this function is part of macOS 10.12 and iOS 10 now static int ra_clock_gettime(int clk_ik, struct timespec *t)
static int clock_gettime(int clk_ik, struct timespec *t)
{ {
struct timeval now; struct timeval now;
int rv = gettimeofday(&now, NULL); int rv = gettimeofday(&now, NULL);
@ -98,8 +107,13 @@ static int clock_gettime(int clk_ik, struct timespec *t)
return 0; return 0;
} }
#endif #endif
#if defined(__MACH__) && (__MAC_OS_X_VERSION_MAX_ALLOWED < 101200) && (__IPHONE_OS_VERSION_MAX_ALLOWED < 100000)
#else
#define ra_clock_gettime clock_gettime
#endif #endif
#ifdef EMSCRIPTEN #ifdef EMSCRIPTEN
#include <emscripten.h> #include <emscripten.h>
#endif #endif
@ -136,8 +150,8 @@ retro_perf_tick_t cpu_features_get_perf_counter(void)
tv_usec = (long)(system_time.wMilliseconds * 1000); tv_usec = (long)(system_time.wMilliseconds * 1000);
time_ticks = (1000000 * tv_sec + tv_usec); time_ticks = (1000000 * tv_sec + tv_usec);
#elif defined(__linux__) || defined(__QNX__) || defined(__MACH__) #elif defined(__linux__) || defined(__QNX__) || defined(__MACH__)
struct timespec tv; struct timespec tv = {0};
if (clock_gettime(CLOCK_MONOTONIC, &tv) == 0) if (ra_clock_gettime(CLOCK_MONOTONIC, &tv) == 0)
time_ticks = (retro_perf_tick_t)tv.tv_sec * 1000000000 + time_ticks = (retro_perf_tick_t)tv.tv_sec * 1000000000 +
(retro_perf_tick_t)tv.tv_nsec; (retro_perf_tick_t)tv.tv_nsec;
@ -153,10 +167,14 @@ retro_perf_tick_t cpu_features_get_perf_counter(void)
time_ticks = __mftb(); time_ticks = __mftb();
#elif defined(GEKKO) #elif defined(GEKKO)
time_ticks = gettime(); time_ticks = gettime();
#elif defined(PSP) || defined(VITA) #elif defined(PSP)
sceRtcGetCurrentTick(&time_ticks); sceRtcGetCurrentTick((uint64_t*)&time_ticks);
#elif defined(VITA)
sceRtcGetCurrentTick((SceRtcTick*)&time_ticks);
#elif defined(_3DS) #elif defined(_3DS)
time_ticks = svcGetSystemTick(); time_ticks = svcGetSystemTick();
#elif defined(WIIU)
time_ticks = OSGetSystemTime();
#elif defined(__mips__) #elif defined(__mips__)
struct timeval tv; struct timeval tv;
gettimeofday(&tv,NULL); gettimeofday(&tv,NULL);
@ -192,7 +210,7 @@ retro_time_t cpu_features_get_time_usec(void)
return ticks_to_microsecs(gettime()); return ticks_to_microsecs(gettime());
#elif defined(_POSIX_MONOTONIC_CLOCK) || defined(__QNX__) || defined(ANDROID) || defined(__MACH__) #elif defined(_POSIX_MONOTONIC_CLOCK) || defined(__QNX__) || defined(ANDROID) || defined(__MACH__)
struct timespec tv = {0}; struct timespec tv = {0};
if (clock_gettime(CLOCK_MONOTONIC, &tv) < 0) if (ra_clock_gettime(CLOCK_MONOTONIC, &tv) < 0)
return 0; return 0;
return tv.tv_sec * INT64_C(1000000) + (tv.tv_nsec + 500) / 1000; return tv.tv_sec * INT64_C(1000000) + (tv.tv_nsec + 500) / 1000;
#elif defined(EMSCRIPTEN) #elif defined(EMSCRIPTEN)
@ -205,6 +223,8 @@ retro_time_t cpu_features_get_time_usec(void)
return osGetTime() * 1000; return osGetTime() * 1000;
#elif defined(VITA) #elif defined(VITA)
return sceKernelGetProcessTimeWide(); return sceKernelGetProcessTimeWide();
#elif defined(WIIU)
return ticks_to_us(OSGetSystemTime());
#else #else
#error "Your platform does not have a timer function implemented in cpu_features_get_time_usec(). Cannot continue." #error "Your platform does not have a timer function implemented in cpu_features_get_time_usec(). Cannot continue."
#endif #endif
@ -271,7 +291,7 @@ static uint64_t xgetbv_x86(uint32_t idx)
} }
#endif #endif
#if defined(__ARM_NEON__) #if defined(__ARM_NEON__)
static void arm_enable_runfast_mode(void) static void arm_enable_runfast_mode(void)
{ {
/* RunFast mode. Enables flush-to-zero and some /* RunFast mode. Enables flush-to-zero and some
@ -448,6 +468,8 @@ unsigned cpu_features_get_core_amount(void)
return 4; return 4;
#elif defined(_3DS) #elif defined(_3DS)
return 1; return 1;
#elif defined(WIIU)
return 3;
#elif defined(_SC_NPROCESSORS_ONLN) #elif defined(_SC_NPROCESSORS_ONLN)
/* Linux, most UNIX-likes. */ /* Linux, most UNIX-likes. */
long ret = sysconf(_SC_NPROCESSORS_ONLN); long ret = sysconf(_SC_NPROCESSORS_ONLN);
@ -513,7 +535,7 @@ uint64_t cpu_features_get(void)
{ {
int flags[4]; int flags[4];
int vendor_shuffle[3]; int vendor_shuffle[3];
char vendor[13] = {0}; char vendor[13];
size_t len = 0; size_t len = 0;
uint64_t cpu_flags = 0; uint64_t cpu_flags = 0;
uint64_t cpu = 0; uint64_t cpu = 0;
@ -542,6 +564,12 @@ uint64_t cpu_features_get(void)
cpu |= RETRO_SIMD_MMXEXT; cpu |= RETRO_SIMD_MMXEXT;
} }
len = sizeof(size_t);
if (sysctlbyname("hw.optional.floatingpoint", NULL, &len, NULL, 0) == 0)
{
cpu |= RETRO_SIMD_CMOV;
}
len = sizeof(size_t); len = sizeof(size_t);
if (sysctlbyname("hw.optional.sse", NULL, &len, NULL, 0) == 0) if (sysctlbyname("hw.optional.sse", NULL, &len, NULL, 0) == 0)
cpu |= RETRO_SIMD_SSE; cpu |= RETRO_SIMD_SSE;
@ -593,6 +621,8 @@ uint64_t cpu_features_get(void)
vendor_shuffle[0] = flags[1]; vendor_shuffle[0] = flags[1];
vendor_shuffle[1] = flags[3]; vendor_shuffle[1] = flags[3];
vendor_shuffle[2] = flags[2]; vendor_shuffle[2] = flags[2];
vendor[0] = '\0';
memcpy(vendor, vendor_shuffle, sizeof(vendor_shuffle)); memcpy(vendor, vendor_shuffle, sizeof(vendor_shuffle));
/* printf("[CPUID]: Vendor: %s\n", vendor); */ /* printf("[CPUID]: Vendor: %s\n", vendor); */
@ -608,6 +638,9 @@ uint64_t cpu_features_get(void)
x86_cpuid(1, flags); x86_cpuid(1, flags);
if (flags[3] & (1 << 15))
cpu |= RETRO_SIMD_CMOV;
if (flags[3] & (1 << 23)) if (flags[3] & (1 << 23))
cpu |= RETRO_SIMD_MMX; cpu |= RETRO_SIMD_MMX;
@ -682,6 +715,15 @@ uint64_t cpu_features_get(void)
if (check_arm_cpu_feature("vfpv4")) if (check_arm_cpu_feature("vfpv4"))
cpu |= RETRO_SIMD_VFPV4; cpu |= RETRO_SIMD_VFPV4;
if (check_arm_cpu_feature("asimd"))
{
cpu |= RETRO_SIMD_ASIMD;
#ifdef __ARM_NEON__
cpu |= RETRO_SIMD_NEON;
arm_enable_runfast_mode();
#endif
}
#if 0 #if 0
check_arm_cpu_feature("swp"); check_arm_cpu_feature("swp");
check_arm_cpu_feature("half"); check_arm_cpu_feature("half");
@ -726,6 +768,7 @@ uint64_t cpu_features_get(void)
if (cpu & RETRO_SIMD_VMX128) strlcat(buf, " VMX128", sizeof(buf)); if (cpu & RETRO_SIMD_VMX128) strlcat(buf, " VMX128", sizeof(buf));
if (cpu & RETRO_SIMD_VFPU) strlcat(buf, " VFPU", sizeof(buf)); if (cpu & RETRO_SIMD_VFPU) strlcat(buf, " VFPU", sizeof(buf));
if (cpu & RETRO_SIMD_PS) strlcat(buf, " PS", sizeof(buf)); if (cpu & RETRO_SIMD_PS) strlcat(buf, " PS", sizeof(buf));
if (cpu & RETRO_SIMD_ASIMD) strlcat(buf, " ASIMD", sizeof(buf));
return cpu; return cpu;
} }

5
desmume/src/libretro-common/include/encodings/utf.h
View File

@ -44,6 +44,11 @@ size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars);
const char *utf8skip(const char *str, size_t chars); const char *utf8skip(const char *str, size_t chars);
uint32_t utf8_walk(const char **string);
bool utf16_to_char_string(const uint16_t *in, char *s, size_t len);
RETRO_END_DECLS RETRO_END_DECLS
#endif #endif

8
desmume/src/libretro-common/include/features/features_cpu.h
View File

@ -43,15 +43,17 @@ retro_perf_tick_t cpu_features_get_perf_counter(void);
/** /**
* cpu_features_get_time_usec: * cpu_features_get_time_usec:
* *
* Gets time in microseconds. * * Gets time in microseconds, from an undefined epoch.
* Returns: time in microseconds. * The epoch may change between computers or across reboots.
*
* Returns: time in microseconds
**/ **/
retro_time_t cpu_features_get_time_usec(void); retro_time_t cpu_features_get_time_usec(void);
/** /**
* cpu_features_get: * cpu_features_get:
* *
* Gets CPU features.. * Gets CPU features.
* *
* Returns: bitmask of all CPU features available. * Returns: bitmask of all CPU features available.
**/ **/

37
desmume/src/libretro-common/include/libretro.h
View File

@ -244,6 +244,7 @@ enum retro_language
RETRO_LANGUAGE_CHINESE_SIMPLIFIED = 11, RETRO_LANGUAGE_CHINESE_SIMPLIFIED = 11,
RETRO_LANGUAGE_ESPERANTO = 12, RETRO_LANGUAGE_ESPERANTO = 12,
RETRO_LANGUAGE_POLISH = 13, RETRO_LANGUAGE_POLISH = 13,
RETRO_LANGUAGE_VIETNAMESE = 14,
RETRO_LANGUAGE_LAST, RETRO_LANGUAGE_LAST,
/* Ensure sizeof(enum) == sizeof(int) */ /* Ensure sizeof(enum) == sizeof(int) */
@ -976,6 +977,37 @@ struct retro_hw_render_context_negotiation_interface
* so it will be used after SET_HW_RENDER, but before the context_reset callback. * so it will be used after SET_HW_RENDER, but before the context_reset callback.
*/ */
/* Serialized state is incomplete in some way. Set if serialization is
* usable in typical end-user cases but should not be relied upon to
* implement frame-sensitive frontend features such as netplay or
* rerecording. */
#define RETRO_SERIALIZATION_QUIRK_INCOMPLETE (1 << 0)
/* The core must spend some time initializing before serialization is
* supported. retro_serialize() will initially fail; retro_unserialize()
* and retro_serialize_size() may or may not work correctly either. */
#define RETRO_SERIALIZATION_QUIRK_MUST_INITIALIZE (1 << 1)
/* Serialization size may change within a session. */
#define RETRO_SERIALIZATION_QUIRK_CORE_VARIABLE_SIZE (1 << 2)
/* Set by the frontend to acknowledge that it supports variable-sized
* states. */
#define RETRO_SERIALIZATION_QUIRK_FRONT_VARIABLE_SIZE (1 << 3)
/* Serialized state can only be loaded during the same session. */
#define RETRO_SERIALIZATION_QUIRK_SINGLE_SESSION (1 << 4)
/* Serialized state cannot be loaded on an architecture with a different
* endianness from the one it was saved on. */
#define RETRO_SERIALIZATION_QUIRK_ENDIAN_DEPENDENT (1 << 5)
/* Serialized state cannot be loaded on a different platform from the one it
* was saved on for reasons other than endianness, such as word size
* dependence */
#define RETRO_SERIALIZATION_QUIRK_PLATFORM_DEPENDENT (1 << 6)
#define RETRO_ENVIRONMENT_SET_SERIALIZATION_QUIRKS 44
/* uint64_t * --
* Sets quirk flags associated with serialization. The frontend will zero any flags it doesn't
* recognize or support. Should be set in either retro_init or retro_load_game, but not both.
*/
#define RETRO_MEMDESC_CONST (1 << 0) /* The frontend will never change this memory area once retro_load_game has returned. */ #define RETRO_MEMDESC_CONST (1 << 0) /* The frontend will never change this memory area once retro_load_game has returned. */
#define RETRO_MEMDESC_BIGENDIAN (1 << 1) /* The memory area contains big endian data. Default is little endian. */ #define RETRO_MEMDESC_BIGENDIAN (1 << 1) /* The memory area contains big endian data. Default is little endian. */
#define RETRO_MEMDESC_ALIGN_2 (1 << 16) /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */ #define RETRO_MEMDESC_ALIGN_2 (1 << 16) /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */
@ -1284,6 +1316,8 @@ struct retro_log_callback
#define RETRO_SIMD_VFPV4 (1 << 17) #define RETRO_SIMD_VFPV4 (1 << 17)
#define RETRO_SIMD_POPCNT (1 << 18) #define RETRO_SIMD_POPCNT (1 << 18)
#define RETRO_SIMD_MOVBE (1 << 19) #define RETRO_SIMD_MOVBE (1 << 19)
#define RETRO_SIMD_CMOV (1 << 20)
#define RETRO_SIMD_ASIMD (1 << 21)
typedef uint64_t retro_perf_tick_t; typedef uint64_t retro_perf_tick_t;
typedef int64_t retro_time_t; typedef int64_t retro_time_t;
@ -1657,7 +1691,8 @@ struct retro_hw_render_callback
* be providing preallocated framebuffers. */ * be providing preallocated framebuffers. */
retro_hw_get_current_framebuffer_t get_current_framebuffer; retro_hw_get_current_framebuffer_t get_current_framebuffer;
/* Set by frontend. */ /* Set by frontend.
* Can return all relevant functions, including glClear on Windows. */
retro_hw_get_proc_address_t get_proc_address; retro_hw_get_proc_address_t get_proc_address;
/* Set if render buffers should have depth component attached. /* Set if render buffers should have depth component attached.

21
desmume/src/movie.cpp
View File

@ -22,11 +22,12 @@
#include <limits.h> #include <limits.h>
#include <ctype.h> #include <ctype.h>
#include <time.h> #include <time.h>
#include <string>
#include "utils/guid.h" #include "utils/guid.h"
#include "utils/xstring.h" #include "utils/xstring.h"
#include "utils/datetime.h" #include "utils/datetime.h"
#include "utils/ConvertUTF.h" #include "encodings/utf.h"
#include "MMU.h" #include "MMU.h"
#include "NDSSystem.h" #include "NDSSystem.h"
@ -299,20 +300,14 @@ int MovieData::dump(EMUFILE* fp, bool binary)
fp->fprintf("bootFromFirmware %d\n", CommonSettings.BootFromFirmware?1:0); fp->fprintf("bootFromFirmware %d\n", CommonSettings.BootFromFirmware?1:0);
} }
else { else {
UTF8 fwNicknameUTF8[MAX_FW_NICKNAME_LENGTH*4]; std::wstring wnick((wchar_t*)CommonSettings.fw_config.nickname,CommonSettings.fw_config.nickname_len);
UTF8 *fwNicknameUTF8Start = fwNicknameUTF8; std::string nick = wcstombs(wnick);
const UTF16 *fwNicknameUTF16 = (const UTF16 *)CommonSettings.fw_config.nickname;
memset(fwNicknameUTF8, 0, sizeof(fwNicknameUTF8));
ConvertUTF16toUTF8(&fwNicknameUTF16, fwNicknameUTF16 + CommonSettings.fw_config.nickname_len, &fwNicknameUTF8Start, fwNicknameUTF8Start + sizeof(fwNicknameUTF8), strictConversion);
UTF8 fwMessageUTF8[MAX_FW_MESSAGE_LENGTH*4]; std::wstring wmessage((wchar_t*)CommonSettings.fw_config.message,CommonSettings.fw_config.message_len);
UTF8 *fwMessageUTF8Start = fwMessageUTF8; std::string message = wcstombs(wmessage);
const UTF16 *fwMessageUTF16 = (const UTF16 *)CommonSettings.fw_config.message;
memset(fwMessageUTF8, 0, sizeof(fwMessageUTF8));
ConvertUTF16toUTF8(&fwMessageUTF16, fwMessageUTF16 + CommonSettings.fw_config.message_len, &fwMessageUTF8Start, fwMessageUTF8Start + sizeof(fwMessageUTF8), strictConversion);
fp->fprintf("firmNickname %s\n", fwNicknameUTF8); fp->fprintf("firmNickname %s\n", nick.c_str());
fp->fprintf("firmMessage %s\n", fwMessageUTF8); fp->fprintf("firmMessage %s\n", message.c_str());
fp->fprintf("firmFavColour %d\n", CommonSettings.fw_config.fav_colour); fp->fprintf("firmFavColour %d\n", CommonSettings.fw_config.fav_colour);
fp->fprintf("firmBirthMonth %d\n", CommonSettings.fw_config.birth_month); fp->fprintf("firmBirthMonth %d\n", CommonSettings.fw_config.birth_month);
fp->fprintf("firmBirthDay %d\n", CommonSettings.fw_config.birth_day); fp->fprintf("firmBirthDay %d\n", CommonSettings.fw_config.birth_day);

2
desmume/src/movie.h
View File

@ -38,7 +38,7 @@ typedef struct
u32 rerecord_count; u32 rerecord_count;
bool poweron; bool poweron;
u32 emu_version_used; u32 emu_version_used;
MD5DATA md5_of_rom_used; //MD5DATA md5_of_rom_used;
std::string name_of_rom_used; std::string name_of_rom_used;
std::vector<std::wstring> comments; std::vector<std::wstring> comments;

539
desmume/src/utils/ConvertUTF.c
View File

@ -1,539 +0,0 @@
/*
* Copyright 2001-2004 Unicode, Inc.
*
* Disclaimer
*
* This source code is provided as is by Unicode, Inc. No claims are
* made as to fitness for any particular purpose. No warranties of any
* kind are expressed or implied. The recipient agrees to determine
* applicability of information provided. If this file has been
* purchased on magnetic or optical media from Unicode, Inc., the
* sole remedy for any claim will be exchange of defective media
* within 90 days of receipt.
*
* Limitations on Rights to Redistribute This Code
*
* Unicode, Inc. hereby grants the right to freely use the information
* supplied in this file in the creation of products supporting the
* Unicode Standard, and to make copies of this file in any form
* for internal or external distribution as long as this notice
* remains attached.
*/
/* ---------------------------------------------------------------------
Conversions between UTF32, UTF-16, and UTF-8. Source code file.
Author: Mark E. Davis, 1994.
Rev History: Rick McGowan, fixes & updates May 2001.
Sept 2001: fixed const & error conditions per
mods suggested by S. Parent & A. Lillich.
June 2002: Tim Dodd added detection and handling of incomplete
source sequences, enhanced error detection, added casts
to eliminate compiler warnings.
July 2003: slight mods to back out aggressive FFFE detection.
Jan 2004: updated switches in from-UTF8 conversions.
Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions.
See the header file "ConvertUTF.h" for complete documentation.
------------------------------------------------------------------------ */
#include "ConvertUTF.h"
#ifdef CVTUTF_DEBUG
#include <stdio.h>
#endif
static const int halfShift = 10; /* used for shifting by 10 bits */
static const UTF32 halfBase = 0x0010000UL;
static const UTF32 halfMask = 0x3FFUL;
#define UNI_SUR_HIGH_START (UTF32)0xD800
#define UNI_SUR_HIGH_END (UTF32)0xDBFF
#define UNI_SUR_LOW_START (UTF32)0xDC00
#define UNI_SUR_LOW_END (UTF32)0xDFFF
#define false 0
#define true 1
/* --------------------------------------------------------------------- */
ConversionResult ConvertUTF32toUTF16 (
const UTF32** sourceStart, const UTF32* sourceEnd,
UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK;
const UTF32* source = *sourceStart;
UTF16* target = *targetStart;
while (source < sourceEnd) {
UTF32 ch;
if (target >= targetEnd) {
result = targetExhausted; break;
}
ch = *source++;
if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
/* UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values */
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
if (flags == strictConversion) {
--source; /* return to the illegal value itself */
result = sourceIllegal;
break;
} else {
*target++ = UNI_REPLACEMENT_CHAR;
}
} else {
*target++ = (UTF16)ch; /* normal case */
}
} else if (ch > UNI_MAX_LEGAL_UTF32) {
if (flags == strictConversion) {
result = sourceIllegal;
} else {
*target++ = UNI_REPLACEMENT_CHAR;
}
} else {
/* target is a character in range 0xFFFF - 0x10FFFF. */
if (target + 1 >= targetEnd) {
--source; /* Back up source pointer! */
result = targetExhausted; break;
}
ch -= halfBase;
*target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
*target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
}
}
*sourceStart = source;
*targetStart = target;
return result;
}
/* --------------------------------------------------------------------- */
ConversionResult ConvertUTF16toUTF32 (
const UTF16** sourceStart, const UTF16* sourceEnd,
UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK;
const UTF16* source = *sourceStart;
UTF32* target = *targetStart;
UTF32 ch, ch2;
while (source < sourceEnd) {
const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
ch = *source++;
/* If we have a surrogate pair, convert to UTF32 first. */
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
/* If the 16 bits following the high surrogate are in the source buffer... */
if (source < sourceEnd) {
ch2 = *source;
/* If it's a low surrogate, convert to UTF32. */
if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
+ (ch2 - UNI_SUR_LOW_START) + halfBase;
++source;
} else if (flags == strictConversion) { /* it's an unpaired high surrogate */
--source; /* return to the illegal value itself */
result = sourceIllegal;
break;
}
} else { /* We don't have the 16 bits following the high surrogate. */
--source; /* return to the high surrogate */
result = sourceExhausted;
break;
}
} else if (flags == strictConversion) {
/* UTF-16 surrogate values are illegal in UTF-32 */
if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
--source; /* return to the illegal value itself */
result = sourceIllegal;
break;
}
}
if (target >= targetEnd) {
source = oldSource; /* Back up source pointer! */
result = targetExhausted; break;
}
*target++ = ch;
}
*sourceStart = source;
*targetStart = target;
#ifdef CVTUTF_DEBUG
if (result == sourceIllegal) {
fprintf(stderr, "ConvertUTF16toUTF32 illegal seq 0x%04x,%04x\n", ch, ch2);
fflush(stderr);
}
#endif
return result;
}
/* --------------------------------------------------------------------- */
/*
* Index into the table below with the first byte of a UTF-8 sequence to
* get the number of trailing bytes that are supposed to follow it.
* Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
* left as-is for anyone who may want to do such conversion, which was
* allowed in earlier algorithms.
*/
static const char trailingBytesForUTF8[256] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
};
/*
* Magic values subtracted from a buffer value during UTF8 conversion.
* This table contains as many values as there might be trailing bytes
* in a UTF-8 sequence.
*/
static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
0x03C82080UL, 0xFA082080UL, 0x82082080UL };
/*
* Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
* into the first byte, depending on how many bytes follow. There are
* as many entries in this table as there are UTF-8 sequence types.
* (I.e., one byte sequence, two byte... etc.). Remember that sequencs
* for *legal* UTF-8 will be 4 or fewer bytes total.
*/
static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
/* --------------------------------------------------------------------- */
/* The interface converts a whole buffer to avoid function-call overhead.
* Constants have been gathered. Loops & conditionals have been removed as
* much as possible for efficiency, in favor of drop-through switches.
* (See "Note A" at the bottom of the file for equivalent code.)
* If your compiler supports it, the "isLegalUTF8" call can be turned
* into an inline function.
*/
/* --------------------------------------------------------------------- */
ConversionResult ConvertUTF16toUTF8 (
const UTF16** sourceStart, const UTF16* sourceEnd,
UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK;
const UTF16* source = *sourceStart;
UTF8* target = *targetStart;
while (source < sourceEnd) {
UTF32 ch;
unsigned short bytesToWrite = 0;
const UTF32 byteMask = 0xBF;
const UTF32 byteMark = 0x80;
const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
ch = *source++;
/* If we have a surrogate pair, convert to UTF32 first. */
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
/* If the 16 bits following the high surrogate are in the source buffer... */
if (source < sourceEnd) {
UTF32 ch2 = *source;
/* If it's a low surrogate, convert to UTF32. */
if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
+ (ch2 - UNI_SUR_LOW_START) + halfBase;
++source;
} else if (flags == strictConversion) { /* it's an unpaired high surrogate */
--source; /* return to the illegal value itself */
result = sourceIllegal;
break;
}
} else { /* We don't have the 16 bits following the high surrogate. */
--source; /* return to the high surrogate */
result = sourceExhausted;
break;
}
} else if (flags == strictConversion) {
/* UTF-16 surrogate values are illegal in UTF-32 */
if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
--source; /* return to the illegal value itself */
result = sourceIllegal;
break;
}
}
/* Figure out how many bytes the result will require */
if (ch < (UTF32)0x80) { bytesToWrite = 1;
} else if (ch < (UTF32)0x800) { bytesToWrite = 2;
} else if (ch < (UTF32)0x10000) { bytesToWrite = 3;
} else if (ch < (UTF32)0x110000) { bytesToWrite = 4;
} else { bytesToWrite = 3;
ch = UNI_REPLACEMENT_CHAR;
}
target += bytesToWrite;
if (target > targetEnd) {
source = oldSource; /* Back up source pointer! */
target -= bytesToWrite; result = targetExhausted; break;
}
switch (bytesToWrite) { /* note: everything falls through. */
case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
case 1: *--target = (UTF8)(ch | firstByteMark[bytesToWrite]);
}
target += bytesToWrite;
}
*sourceStart = source;
*targetStart = target;
return result;
}
/* --------------------------------------------------------------------- */
/*
* Utility routine to tell whether a sequence of bytes is legal UTF-8.
* This must be called with the length pre-determined by the first byte.
* If not calling this from ConvertUTF8to*, then the length can be set by:
* length = trailingBytesForUTF8[*source]+1;
* and the sequence is illegal right away if there aren't that many bytes
* available.
* If presented with a length > 4, this returns false. The Unicode
* definition of UTF-8 goes up to 4-byte sequences.
*/
static Boolean isLegalUTF8(const UTF8 *source, int length) {
UTF8 a;
const UTF8 *srcptr = source+length;
switch (length) {
default: return false;
/* Everything else falls through when "true"... */
case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
case 2: if ((a = (*--srcptr)) > 0xBF) return false;
switch (*source) {
/* no fall-through in this inner switch */
case 0xE0: if (a < 0xA0) return false; break;
case 0xED: if (a > 0x9F) return false; break;
case 0xF0: if (a < 0x90) return false; break;
case 0xF4: if (a > 0x8F) return false; break;
default: if (a < 0x80) return false;
}
case 1: if (*source >= 0x80 && *source < 0xC2) return false;
}
if (*source > 0xF4) return false;
return true;
}
/* --------------------------------------------------------------------- */
/*
* Exported function to return whether a UTF-8 sequence is legal or not.
* This is not used here; it's just exported.
*/
Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
int length = trailingBytesForUTF8[*source]+1;
if (source+length > sourceEnd) {
return false;
}
return isLegalUTF8(source, length);
}
/* --------------------------------------------------------------------- */
ConversionResult ConvertUTF8toUTF16 (
const UTF8** sourceStart, const UTF8* sourceEnd,
UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK;
const UTF8* source = *sourceStart;
UTF16* target = *targetStart;
while (source < sourceEnd) {
UTF32 ch = 0;
unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
if (source + extraBytesToRead >= sourceEnd) {
result = sourceExhausted; break;
}
/* Do this check whether lenient or strict */
if (! isLegalUTF8(source, extraBytesToRead+1)) {
result = sourceIllegal;
break;
}
/*
* The cases all fall through. See "Note A" below.
*/
switch (extraBytesToRead) {
case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
case 3: ch += *source++; ch <<= 6;
case 2: ch += *source++; ch <<= 6;
case 1: ch += *source++; ch <<= 6;
case 0: ch += *source++;
}
ch -= offsetsFromUTF8[extraBytesToRead];
if (target >= targetEnd) {
source -= (extraBytesToRead+1); /* Back up source pointer! */
result = targetExhausted; break;
}
if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
/* UTF-16 surrogate values are illegal in UTF-32 */
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
if (flags == strictConversion) {
source -= (extraBytesToRead+1); /* return to the illegal value itself */
result = sourceIllegal;
break;
} else {
*target++ = UNI_REPLACEMENT_CHAR;
}
} else {
*target++ = (UTF16)ch; /* normal case */
}
} else if (ch > UNI_MAX_UTF16) {
if (flags == strictConversion) {
result = sourceIllegal;
source -= (extraBytesToRead+1); /* return to the start */
break; /* Bail out; shouldn't continue */
} else {
*target++ = UNI_REPLACEMENT_CHAR;
}
} else {
/* target is a character in range 0xFFFF - 0x10FFFF. */
if (target + 1 >= targetEnd) {
source -= (extraBytesToRead+1); /* Back up source pointer! */
result = targetExhausted; break;
}
ch -= halfBase;
*target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
*target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
}
}
*sourceStart = source;
*targetStart = target;
return result;
}
/* --------------------------------------------------------------------- */
ConversionResult ConvertUTF32toUTF8 (
const UTF32** sourceStart, const UTF32* sourceEnd,
UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK;
const UTF32* source = *sourceStart;
UTF8* target = *targetStart;
while (source < sourceEnd) {
UTF32 ch;
unsigned short bytesToWrite = 0;
const UTF32 byteMask = 0xBF;
const UTF32 byteMark = 0x80;
ch = *source++;
if (flags == strictConversion ) {
/* UTF-16 surrogate values are illegal in UTF-32 */
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
--source; /* return to the illegal value itself */
result = sourceIllegal;
break;
}
}
/*
* Figure out how many bytes the result will require. Turn any
* illegally large UTF32 things (> Plane 17) into replacement chars.
*/
if (ch < (UTF32)0x80) { bytesToWrite = 1;
} else if (ch < (UTF32)0x800) { bytesToWrite = 2;
} else if (ch < (UTF32)0x10000) { bytesToWrite = 3;
} else if (ch <= UNI_MAX_LEGAL_UTF32) { bytesToWrite = 4;
} else { bytesToWrite = 3;
ch = UNI_REPLACEMENT_CHAR;
result = sourceIllegal;
}
target += bytesToWrite;
if (target > targetEnd) {
--source; /* Back up source pointer! */
target -= bytesToWrite; result = targetExhausted; break;
}
switch (bytesToWrite) { /* note: everything falls through. */
case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
case 1: *--target = (UTF8) (ch | firstByteMark[bytesToWrite]);
}
target += bytesToWrite;
}
*sourceStart = source;
*targetStart = target;
return result;
}
/* --------------------------------------------------------------------- */
ConversionResult ConvertUTF8toUTF32 (
const UTF8** sourceStart, const UTF8* sourceEnd,
UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
ConversionResult result = conversionOK;
const UTF8* source = *sourceStart;
UTF32* target = *targetStart;
while (source < sourceEnd) {
UTF32 ch = 0;
unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
if (source + extraBytesToRead >= sourceEnd) {
result = sourceExhausted; break;
}
/* Do this check whether lenient or strict */
if (! isLegalUTF8(source, extraBytesToRead+1)) {
result = sourceIllegal;
break;
}
/*
* The cases all fall through. See "Note A" below.
*/
switch (extraBytesToRead) {
case 5: ch += *source++; ch <<= 6;
case 4: ch += *source++; ch <<= 6;
case 3: ch += *source++; ch <<= 6;
case 2: ch += *source++; ch <<= 6;
case 1: ch += *source++; ch <<= 6;
case 0: ch += *source++;
}
ch -= offsetsFromUTF8[extraBytesToRead];
if (target >= targetEnd) {
source -= (extraBytesToRead+1); /* Back up the source pointer! */
result = targetExhausted; break;
}
if (ch <= UNI_MAX_LEGAL_UTF32) {
/*
* UTF-16 surrogate values are illegal in UTF-32, and anything
* over Plane 17 (> 0x10FFFF) is illegal.
*/
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
if (flags == strictConversion) {
source -= (extraBytesToRead+1); /* return to the illegal value itself */
result = sourceIllegal;
break;
} else {
*target++ = UNI_REPLACEMENT_CHAR;
}
} else {
*target++ = ch;
}
} else { /* i.e., ch > UNI_MAX_LEGAL_UTF32 */
result = sourceIllegal;
*target++ = UNI_REPLACEMENT_CHAR;
}
}
*sourceStart = source;
*targetStart = target;
return result;
}
/* ---------------------------------------------------------------------
Note A.
The fall-through switches in UTF-8 reading code save a
temp variable, some decrements & conditionals. The switches
are equivalent to the following loop:
{
int tmpBytesToRead = extraBytesToRead+1;
do {
ch += *source++;
--tmpBytesToRead;
if (tmpBytesToRead) ch <<= 6;
} while (tmpBytesToRead > 0);
}
In UTF-8 writing code, the switches on "bytesToWrite" are
similarly unrolled loops.
--------------------------------------------------------------------- */

162
desmume/src/utils/ConvertUTF.h
View File

@ -1,162 +0,0 @@
/*
* Copyright 2001-2004 Unicode, Inc.
*
* Disclaimer
*
* This source code is provided as is by Unicode, Inc. No claims are
* made as to fitness for any particular purpose. No warranties of any
* kind are expressed or implied. The recipient agrees to determine
* applicability of information provided. If this file has been
* purchased on magnetic or optical media from Unicode, Inc., the
* sole remedy for any claim will be exchange of defective media
* within 90 days of receipt.
*
* Limitations on Rights to Redistribute This Code
*
* Unicode, Inc. hereby grants the right to freely use the information
* supplied in this file in the creation of products supporting the
* Unicode Standard, and to make copies of this file in any form
* for internal or external distribution as long as this notice
* remains attached.
*/
/* ---------------------------------------------------------------------
Conversions between UTF32, UTF-16, and UTF-8. Header file.
Several funtions are included here, forming a complete set of
conversions between the three formats. UTF-7 is not included
here, but is handled in a separate source file.
Each of these routines takes pointers to input buffers and output
buffers. The input buffers are const.
Each routine converts the text between *sourceStart and sourceEnd,
putting the result into the buffer between *targetStart and
targetEnd. Note: the end pointers are *after* the last item: e.g.
*(sourceEnd - 1) is the last item.
The return result indicates whether the conversion was successful,
and if not, whether the problem was in the source or target buffers.
(Only the first encountered problem is indicated.)
After the conversion, *sourceStart and *targetStart are both
updated to point to the end of last text successfully converted in
the respective buffers.
Input parameters:
sourceStart - pointer to a pointer to the source buffer.
The contents of this are modified on return so that
it points at the next thing to be converted.
targetStart - similarly, pointer to pointer to the target buffer.
sourceEnd, targetEnd - respectively pointers to the ends of the
two buffers, for overflow checking only.
These conversion functions take a ConversionFlags argument. When this
flag is set to strict, both irregular sequences and isolated surrogates
will cause an error. When the flag is set to lenient, both irregular
sequences and isolated surrogates are converted.
Whether the flag is strict or lenient, all illegal sequences will cause
an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
must check for illegal sequences.
When the flag is set to lenient, characters over 0x10FFFF are converted
to the replacement character; otherwise (when the flag is set to strict)
they constitute an error.
Output parameters:
The value "sourceIllegal" is returned from some routines if the input
sequence is malformed. When "sourceIllegal" is returned, the source
value will point to the illegal value that caused the problem. E.g.,
in UTF-8 when a sequence is malformed, it points to the start of the
malformed sequence.
Author: Mark E. Davis, 1994.
Rev History: Rick McGowan, fixes & updates May 2001.
Fixes & updates, Sept 2001.
------------------------------------------------------------------------ */
/* ---------------------------------------------------------------------
The following 4 definitions are compiler-specific.
The C standard does not guarantee that wchar_t has at least
16 bits, so wchar_t is no less portable than unsigned short!
All should be unsigned values to avoid sign extension during
bit mask & shift operations.
------------------------------------------------------------------------ */
#ifndef __CONVERTUTF_H__
#define __CONVERTUTF_H__
#if defined(_MSC_VER)
typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
#else
#include <stdint.h>
#endif
typedef uint32_t UTF32;
typedef uint16_t UTF16;
typedef uint8_t UTF8;
typedef uint8_t Boolean; /* 0 or 1 */
/* Some fundamental constants */
#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
#define UNI_MAX_BMP (UTF32)0x0000FFFF
#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
typedef enum {
conversionOK, /* conversion successful */
sourceExhausted, /* partial character in source, but hit end */
targetExhausted, /* insuff. room in target for conversion */
sourceIllegal /* source sequence is illegal/malformed */
} ConversionResult;
typedef enum {
strictConversion = 0,
lenientConversion
} ConversionFlags;
/* This is for C++ and does no harm in C */
#ifdef __cplusplus
extern "C" {
#endif
ConversionResult ConvertUTF8toUTF16 (
const UTF8** sourceStart, const UTF8* sourceEnd,
UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
ConversionResult ConvertUTF16toUTF8 (
const UTF16** sourceStart, const UTF16* sourceEnd,
UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
ConversionResult ConvertUTF8toUTF32 (
const UTF8** sourceStart, const UTF8* sourceEnd,
UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
ConversionResult ConvertUTF32toUTF8 (
const UTF32** sourceStart, const UTF32* sourceEnd,
UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
ConversionResult ConvertUTF16toUTF32 (
const UTF16** sourceStart, const UTF16* sourceEnd,
UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
ConversionResult ConvertUTF32toUTF16 (
const UTF32** sourceStart, const UTF32* sourceEnd,
UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
#ifdef __cplusplus
}
#endif
#endif // __CONVERTUTF_H__
/* --------------------------------------------------------------------- */

17
desmume/src/utils/guid.h
View File

@ -21,7 +21,22 @@
#include <string> #include <string>
#include <cstdio> #include <cstdio>
#include "../types.h" #include "../types.h"
#include "valuearray.h"
template<typename T, int N>
struct ValueArray
{
T data[N];
T &operator[](int index) { return data[index]; }
static const int size = N;
bool operator!=(ValueArray<T,N> &other) { return !operator==(other); }
bool operator==(ValueArray<T,N> &other)
{
for(int i=0;i<size;i++)
if(data[i] != other[i])
return false;
return true;
}
};
struct Desmume_Guid : public ValueArray<u8,16> struct Desmume_Guid : public ValueArray<u8,16>
{ {

248
desmume/src/utils/md5.cpp
View File

@ -1,248 +0,0 @@
/// \file
/// \brief RFC 1321 compliant MD5 implementation,
/// RFC 1321 compliant MD5 implementation,
/// by Christophe Devine <devine@cr0.net>;
/// this program is licensed under the GPL.
//Modified October 3, 2003, to remove testing code, and add include of "types.h".
//Added simple MD5 to ASCII string conversion function.
// -Xodnizel
#include <string.h>
#include "../types.h"
#include "md5.h"
typedef u8 uint8;
typedef u16 uint16;
typedef u32 uint32;
#define GET_UINT32(n,b,i) \
{ \
(n) = ( (uint32) (b)[(i) + 3] << 24 ) \
| ( (uint32) (b)[(i) + 2] << 16 ) \
| ( (uint32) (b)[(i) + 1] << 8 ) \
| ( (uint32) (b)[(i) ] ); \
}
#define PUT_UINT32(n,b,i) \
{ \
(b)[(i) ] = (uint8) ( (n) ); \
(b)[(i) + 1] = (uint8) ( (n) >> 8 ); \
(b)[(i) + 2] = (uint8) ( (n) >> 16 ); \
(b)[(i) + 3] = (uint8) ( (n) >> 24 ); \
}
void md5_starts( struct md5_context *ctx )
{
ctx->total[0] = 0;
ctx->total[1] = 0;
ctx->state[0] = 0x67452301;
ctx->state[1] = 0xEFCDAB89;
ctx->state[2] = 0x98BADCFE;
ctx->state[3] = 0x10325476;
}
static void md5_process( struct md5_context *ctx, uint8 data[64] )
{
uint32 A, B, C, D, X[16];
GET_UINT32( X[0], data, 0 );
GET_UINT32( X[1], data, 4 );
GET_UINT32( X[2], data, 8 );
GET_UINT32( X[3], data, 12 );
GET_UINT32( X[4], data, 16 );
GET_UINT32( X[5], data, 20 );
GET_UINT32( X[6], data, 24 );
GET_UINT32( X[7], data, 28 );
GET_UINT32( X[8], data, 32 );
GET_UINT32( X[9], data, 36 );
GET_UINT32( X[10], data, 40 );
GET_UINT32( X[11], data, 44 );
GET_UINT32( X[12], data, 48 );
GET_UINT32( X[13], data, 52 );
GET_UINT32( X[14], data, 56 );
GET_UINT32( X[15], data, 60 );
#define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
#define P(a,b,c,d,k,s,t) \
{ \
a += F(b,c,d) + X[k] + t; a = S(a,s) + b; \
}
A = ctx->state[0];
B = ctx->state[1];
C = ctx->state[2];
D = ctx->state[3];
#define F(x,y,z) (z ^ (x & (y ^ z)))
P( A, B, C, D, 0, 7, 0xD76AA478 );
P( D, A, B, C, 1, 12, 0xE8C7B756 );
P( C, D, A, B, 2, 17, 0x242070DB );
P( B, C, D, A, 3, 22, 0xC1BDCEEE );
P( A, B, C, D, 4, 7, 0xF57C0FAF );
P( D, A, B, C, 5, 12, 0x4787C62A );
P( C, D, A, B, 6, 17, 0xA8304613 );
P( B, C, D, A, 7, 22, 0xFD469501 );
P( A, B, C, D, 8, 7, 0x698098D8 );
P( D, A, B, C, 9, 12, 0x8B44F7AF );
P( C, D, A, B, 10, 17, 0xFFFF5BB1 );
P( B, C, D, A, 11, 22, 0x895CD7BE );
P( A, B, C, D, 12, 7, 0x6B901122 );
P( D, A, B, C, 13, 12, 0xFD987193 );
P( C, D, A, B, 14, 17, 0xA679438E );
P( B, C, D, A, 15, 22, 0x49B40821 );
#undef F
#define F(x,y,z) (y ^ (z & (x ^ y)))
P( A, B, C, D, 1, 5, 0xF61E2562 );
P( D, A, B, C, 6, 9, 0xC040B340 );
P( C, D, A, B, 11, 14, 0x265E5A51 );
P( B, C, D, A, 0, 20, 0xE9B6C7AA );
P( A, B, C, D, 5, 5, 0xD62F105D );
P( D, A, B, C, 10, 9, 0x02441453 );
P( C, D, A, B, 15, 14, 0xD8A1E681 );
P( B, C, D, A, 4, 20, 0xE7D3FBC8 );
P( A, B, C, D, 9, 5, 0x21E1CDE6 );
P( D, A, B, C, 14, 9, 0xC33707D6 );
P( C, D, A, B, 3, 14, 0xF4D50D87 );
P( B, C, D, A, 8, 20, 0x455A14ED );
P( A, B, C, D, 13, 5, 0xA9E3E905 );
P( D, A, B, C, 2, 9, 0xFCEFA3F8 );
P( C, D, A, B, 7, 14, 0x676F02D9 );
P( B, C, D, A, 12, 20, 0x8D2A4C8A );
#undef F
#define F(x,y,z) (x ^ y ^ z)
P( A, B, C, D, 5, 4, 0xFFFA3942 );
P( D, A, B, C, 8, 11, 0x8771F681 );
P( C, D, A, B, 11, 16, 0x6D9D6122 );
P( B, C, D, A, 14, 23, 0xFDE5380C );
P( A, B, C, D, 1, 4, 0xA4BEEA44 );
P( D, A, B, C, 4, 11, 0x4BDECFA9 );
P( C, D, A, B, 7, 16, 0xF6BB4B60 );
P( B, C, D, A, 10, 23, 0xBEBFBC70 );
P( A, B, C, D, 13, 4, 0x289B7EC6 );
P( D, A, B, C, 0, 11, 0xEAA127FA );
P( C, D, A, B, 3, 16, 0xD4EF3085 );
P( B, C, D, A, 6, 23, 0x04881D05 );
P( A, B, C, D, 9, 4, 0xD9D4D039 );
P( D, A, B, C, 12, 11, 0xE6DB99E5 );
P( C, D, A, B, 15, 16, 0x1FA27CF8 );
P( B, C, D, A, 2, 23, 0xC4AC5665 );
#undef F
#define F(x,y,z) (y ^ (x | ~z))
P( A, B, C, D, 0, 6, 0xF4292244 );
P( D, A, B, C, 7, 10, 0x432AFF97 );
P( C, D, A, B, 14, 15, 0xAB9423A7 );
P( B, C, D, A, 5, 21, 0xFC93A039 );
P( A, B, C, D, 12, 6, 0x655B59C3 );
P( D, A, B, C, 3, 10, 0x8F0CCC92 );
P( C, D, A, B, 10, 15, 0xFFEFF47D );
P( B, C, D, A, 1, 21, 0x85845DD1 );
P( A, B, C, D, 8, 6, 0x6FA87E4F );
P( D, A, B, C, 15, 10, 0xFE2CE6E0 );
P( C, D, A, B, 6, 15, 0xA3014314 );
P( B, C, D, A, 13, 21, 0x4E0811A1 );
P( A, B, C, D, 4, 6, 0xF7537E82 );
P( D, A, B, C, 11, 10, 0xBD3AF235 );
P( C, D, A, B, 2, 15, 0x2AD7D2BB );
P( B, C, D, A, 9, 21, 0xEB86D391 );
#undef F
ctx->state[0] += A;
ctx->state[1] += B;
ctx->state[2] += C;
ctx->state[3] += D;
}
void md5_update( struct md5_context *ctx, uint8 *input, uint32 length )
{
uint32 left, fill;
if( ! length ) return;
left = ( ctx->total[0] >> 3 ) & 0x3F;
fill = 64 - left;
ctx->total[0] += length << 3;
ctx->total[1] += length >> 29;
ctx->total[0] &= 0xFFFFFFFF;
ctx->total[1] += ctx->total[0] < ( length << 3 );
if( left && length >= fill )
{
memcpy( (void *) (ctx->buffer + left), (void *) input, fill );
md5_process( ctx, ctx->buffer );
length -= fill;
input += fill;
left = 0;
}
while( length >= 64 )
{
md5_process( ctx, input );
length -= 64;
input += 64;
}
if( length )
{
memcpy( (void *) (ctx->buffer + left), (void *) input, length );
}
}
static uint8 md5_padding[64] =
{
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
void md5_finish( struct md5_context *ctx, uint8 digest[16] )
{
uint32 last, padn;
uint8 msglen[8];
PUT_UINT32( ctx->total[0], msglen, 0 );
PUT_UINT32( ctx->total[1], msglen, 4 );
last = ( ctx->total[0] >> 3 ) & 0x3F;
padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
md5_update( ctx, md5_padding, padn );
md5_update( ctx, msglen, 8 );
PUT_UINT32( ctx->state[0], digest, 0 );
PUT_UINT32( ctx->state[1], digest, 4 );
PUT_UINT32( ctx->state[2], digest, 8 );
PUT_UINT32( ctx->state[3], digest, 12 );
}
/* Uses a static buffer, so beware of how it's used. */
char *md5_asciistr(MD5DATA& md5)
{
uint8* digest = md5.data;
static char str[33];
static char trans[16]={'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
int x;
for(x=0;x<16;x++)
{
str[x*2]=trans[digest[x]>>4];
str[x*2+1]=trans[digest[x]&0x0F];
}
return(str);
}

23
desmume/src/utils/md5.h
View File

@ -1,23 +0,0 @@
#ifndef _MD5_H
#define _MD5_H
#include "../types.h"
#include "valuearray.h"
struct md5_context
{
u32 total[2];
u32 state[4];
u8 buffer[64];
};
typedef ValueArray<uint8,16> MD5DATA;
void md5_starts( struct md5_context *ctx );
void md5_update( struct md5_context *ctx, u8 *input, u32 length );
void md5_finish( struct md5_context *ctx, u8 digest[16] );
/* Uses a static buffer, so beware of how it's used. */
char *md5_asciistr(MD5DATA& md5);
#endif /* md5.h */

38
desmume/src/utils/valuearray.h
View File

@ -1,38 +0,0 @@
/*
Copyright (C) 2008 DeSmuME team
This file is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This file 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 General Public License for more details.
You should have received a copy of the GNU General Public License
along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _VALUEARRAY_H_
#define _VALUEARRAY_H_
template<typename T, int N>
struct ValueArray
{
T data[N];
T &operator[](int index) { return data[index]; }
static const int size = N;
bool operator!=(ValueArray<T,N> &other) { return !operator==(other); }
bool operator==(ValueArray<T,N> &other)
{
for(int i=0;i<size;i++)
if(data[i] != other[i])
return false;
return true;
}
};
#endif

130
desmume/src/utils/xstring.cpp
View File

@ -18,8 +18,9 @@
along with the this software. If not, see <http://www.gnu.org/licenses/>. along with the this software. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "xstring.h"
#include <string> #include <string>
#include "encodings/utf.h"
#include "xstring.h"
//a vc-style substring operation (very kind and lenient) //a vc-style substring operation (very kind and lenient)
std::string strsub(const std::string& str, int pos, int len) { std::string strsub(const std::string& str, int pos, int len) {
@ -283,118 +284,33 @@ std::string mass_replace(const std::string &source, const std::string &victim, c
return answer; return answer;
} }
//http://www.codeproject.com/KB/string/UtfConverter.aspx
#include "ConvertUTF.h"
namespace UtfConverter
{
static std::wstring FromUtf8(const std::string& utf8string)
{
size_t widesize = utf8string.length();
if (sizeof(wchar_t) == 2)
{
wchar_t* widestringnative = new wchar_t[widesize+1];
const UTF8* sourcestart = reinterpret_cast<const UTF8*>(utf8string.c_str());
const UTF8* sourceend = sourcestart + widesize;
UTF16* targetstart = reinterpret_cast<UTF16*>(widestringnative);
UTF16* targetend = targetstart + widesize+1;
ConversionResult res = ConvertUTF8toUTF16(&sourcestart, sourceend, &targetstart, targetend, strictConversion);
if (res != conversionOK)
{
delete [] widestringnative;
throw std::exception();
}
*targetstart = 0;
std::wstring resultstring(widestringnative);
delete [] widestringnative;
return resultstring;
}
else if (sizeof(wchar_t) == 4)
{
wchar_t* widestringnative = new wchar_t[widesize+1];
const UTF8* sourcestart = reinterpret_cast<const UTF8*>(utf8string.c_str());
const UTF8* sourceend = sourcestart + widesize;
UTF32* targetstart = reinterpret_cast<UTF32*>(widestringnative);
UTF32* targetend = targetstart + widesize+1;
ConversionResult res = ConvertUTF8toUTF32(&sourcestart, sourceend, &targetstart, targetend, strictConversion);
if (res != conversionOK)
{
delete [] widestringnative;
throw std::exception();
}
*targetstart = 0;
std::wstring resultstring(widestringnative);
delete [] widestringnative;
return resultstring;
}
else
{
throw std::exception();
}
return L"";
}
static std::string ToUtf8(const std::wstring& widestring)
{
size_t widesize = widestring.length();
if (sizeof(wchar_t) == 2)
{
size_t utf8size = 3 * widesize + 1;
char* utf8stringnative = new char[utf8size];
const UTF16* sourcestart = reinterpret_cast<const UTF16*>(widestring.c_str());
const UTF16* sourceend = sourcestart + widesize;
UTF8* targetstart = reinterpret_cast<UTF8*>(utf8stringnative);
UTF8* targetend = targetstart + utf8size;
ConversionResult res = ConvertUTF16toUTF8(&sourcestart, sourceend, &targetstart, targetend, strictConversion);
if (res != conversionOK)
{
delete [] utf8stringnative;
throw std::exception();
}
*targetstart = 0;
std::string resultstring(utf8stringnative);
delete [] utf8stringnative;
return resultstring;
}
else if (sizeof(wchar_t) == 4)
{
size_t utf8size = 4 * widesize + 1;
char* utf8stringnative = new char[utf8size];
const UTF32* sourcestart = reinterpret_cast<const UTF32*>(widestring.c_str());
const UTF32* sourceend = sourcestart + widesize;
UTF8* targetstart = reinterpret_cast<UTF8*>(utf8stringnative);
UTF8* targetend = targetstart + utf8size;
ConversionResult res = ConvertUTF32toUTF8(&sourcestart, sourceend, &targetstart, targetend, strictConversion);
if (res != conversionOK)
{
delete [] utf8stringnative;
throw std::exception();
}
*targetstart = 0;
std::string resultstring(utf8stringnative);
delete [] utf8stringnative;
return resultstring;
}
else
{
throw std::exception();
}
return "";
}
}
//convert a std::string to std::wstring //convert a std::string to std::wstring
std::wstring mbstowcs(std::string str) std::wstring mbstowcs(std::string str)
{ {
try { size_t len = utf8len(str.c_str());
return UtfConverter::FromUtf8(str); u32* tmp32 = new u32[len+1];
} catch(std::exception) { wchar_t* tmp16 = new wchar_t[len+1];
return L"(failed UTF-8 conversion)"; utf8_conv_utf32(tmp32,len+1,str.c_str(),len+1);
}
//truncate the utf32 output to utf16.
//I know that's amazingly sloppy, but it should work for us, probably (libretro-common's facilities are underpowered at the present)
for(size_t i=0;i<len+1;i++)
tmp16[i] = tmp32[i];
std::wstring ret = tmp16;
delete[] tmp32;
delete[] tmp16;
return ret;
} }
std::string wcstombs(std::wstring str) std::string wcstombs(std::wstring str)
{ {
return UtfConverter::ToUtf8(str); size_t len = str.length();
char *tmp8 = new char[len+1];
utf16_to_char_string((u16*)str.c_str(),tmp8,len+1);
std::string ret = tmp8;
delete[] tmp8;
return ret;
} }