notaz.gp2x.de
/
gpsp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revive PC build, support Linux
[gpsp.git]
/
cpu_threaded.c
diff --git
a/cpu_threaded.c
b/cpu_threaded.c
index
4ff1548
..
c1d85a8
100644
(file)
--- a/
cpu_threaded.c
+++ b/
cpu_threaded.c
@@
-190,13
+190,9
@@
extern u8 bit_count[256];
#include "psp/mips_emit.h"
#include "psp/mips_emit.h"
-#elif defined(
GP2X_BUILD
)
+#elif defined(
ARM_ARCH
)
-#include "gp2x/arm_emit.h"
-
-#elif defined(GIZ_BUILD)
-
-#include "giz/arm_emit.h"
+#include "arm/arm_emit.h"
#else
#else
@@
-2841,7
+2837,7
@@
u8 function_cc *block_lookup_address_##type(u32 pc) \
char buffer[256]; \
sprintf(buffer, "bad jump %x (%x) (%x)\n", pc, reg[REG_PC], \
last_instruction); \
char buffer[256]; \
sprintf(buffer, "bad jump %x (%x) (%x)\n", pc, reg[REG_PC], \
last_instruction); \
- printf(
buffer);
\
+ printf(
"%s", buffer);
\
quit(); \
} \
block_address = (u8 *)(-1); \
quit(); \
} \
block_address = (u8 *)(-1); \
@@
-3411,8
+3407,10
@@
void flush_translation_cache_ram()
invalidate_icache_region(ram_translation_cache,
(ram_translation_ptr - ram_translation_cache) + 0x100);
#endif
invalidate_icache_region(ram_translation_cache,
(ram_translation_ptr - ram_translation_cache) + 0x100);
#endif
- ram_translation_ptr = ram_translation_cache;
+#ifdef ARM_ARCH
last_ram_translation_ptr = ram_translation_cache;
last_ram_translation_ptr = ram_translation_cache;
+#endif
+ ram_translation_ptr = ram_translation_cache;
ram_block_tag_top = 0x0101;
if(iwram_code_min != 0xFFFFFFFF)
{
ram_block_tag_top = 0x0101;
if(iwram_code_min != 0xFFFFFFFF)
{
@@
-3466,9
+3464,11
@@
void flush_translation_cache_rom()
invalidate_icache_region(rom_translation_cache,
rom_translation_ptr - rom_translation_cache + 0x100);
#endif
invalidate_icache_region(rom_translation_cache,
rom_translation_ptr - rom_translation_cache + 0x100);
#endif
+#ifdef ARM_ARCH
+ last_rom_translation_ptr = rom_translation_cache;
+#endif
rom_translation_ptr = rom_translation_cache;
rom_translation_ptr = rom_translation_cache;
- last_rom_translation_ptr = rom_translation_cache;
memset(rom_branch_hash, 0, sizeof(rom_branch_hash));
}
memset(rom_branch_hash, 0, sizeof(rom_branch_hash));
}
@@
-3478,18
+3478,16
@@
void flush_translation_cache_bios()
invalidate_icache_region(bios_translation_cache,
bios_translation_ptr - bios_translation_cache + 0x100);
#endif
invalidate_icache_region(bios_translation_cache,
bios_translation_ptr - bios_translation_cache + 0x100);
#endif
+#ifdef ARM_ARCH
+ last_bios_translation_ptr = bios_translation_cache;
+#endif
bios_block_tag_top = 0x0101;
bios_translation_ptr = bios_translation_cache;
bios_block_tag_top = 0x0101;
bios_translation_ptr = bios_translation_cache;
- last_bios_translation_ptr = bios_translation_cache;
memset(bios_rom + 0x4000, 0, 0x4000);
}
memset(bios_rom + 0x4000, 0, 0x4000);
}
-#ifdef GP2X_BUILD
- #define cache_dump_prefix "/mnt/nand/"
-#else
- #define cache_dump_prefix ""
-#endif
+#define cache_dump_prefix ""
void dump_translation_cache()
{
void dump_translation_cache()
{