From 11ec213c99d5d22905ff82cf3fb26ba6a8adf290 Mon Sep 17 00:00:00 2001
From: David Guillen Fandos
Date: Tue, 23 Mar 2021 19:05:35 +0100
Subject: Make ewram memory lineal

This saves a few cycles in MIPS and simplifies a bit the core.
Removed the write map, only affects interpreter performance very
minimally. Rewired ARM and x86 handlers to support direct access to
I/EWRAM (and VRAM on ARM) to compensate. Overall performance is slightly
better but code is cleaner and allows for further improvements in the
dynarecs.
---
 cpu.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'cpu.h')

diff --git a/cpu.h b/cpu.h
index cde7b2f..faa3bc1 100644
--- a/cpu.h
+++ b/cpu.h
@@ -155,11 +155,7 @@ extern u8 *ram_translation_ptr;
 #define MAX_TRANSLATION_GATES 8
 
 extern u32 idle_loop_target_pc;
-extern u32 force_pc_update_target;
 extern u32 iwram_stack_optimize;
-extern u32 allow_smc_ram_u8;
-extern u32 allow_smc_ram_u16;
-extern u32 allow_smc_ram_u32;
 extern u32 direct_map_vram;
 extern u32 translation_gate_targets;
 extern u32 translation_gate_target_pc[MAX_TRANSLATION_GATES];
-- 
cgit v1.2.3


From ff510e7f7a0c04c7862e598e8bfc75747f3bf7d1 Mon Sep 17 00:00:00 2001
From: David Guillen Fandos
Date: Tue, 23 Mar 2021 19:47:51 +0100
Subject: Move caches to stub files to get around gcc 10

Seems that using the __atribute__ magic for sections is not the best way
of doing this, since it injects some default atributtes that collide
with the user defined ones. Using assembly is far easier in this case.

Reworked definitions a bit to make it easier to import from assembly.
Also wrapped stuff around macros for easy and less verbose
implementation of the symbol prefix issue.
---
 cpu.h | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'cpu.h')

diff --git a/cpu.h b/cpu.h
index faa3bc1..fc57626 100644
--- a/cpu.h
+++ b/cpu.h
@@ -20,6 +20,8 @@
 #ifndef CPU_H
 #define CPU_H
 
+#include "gpsp_config.h"
+
 // System mode and user mode are represented as the same here
 
 typedef enum
@@ -120,18 +122,6 @@ s32 translate_block_arm(u32 pc, translation_region_type translation_region,
 s32 translate_block_thumb(u32 pc, translation_region_type translation_region,
  u32 smc_enable);
 
-#if defined(PSP)
-  #define ROM_TRANSLATION_CACHE_SIZE (1024 * 512 * 4)
-  #define RAM_TRANSLATION_CACHE_SIZE (1024 * 384)
-  #define TRANSLATION_CACHE_LIMIT_THRESHOLD (1024)
-#else
-  #define ROM_TRANSLATION_CACHE_SIZE (1024 * 512 * 4 * 5)
-  #define RAM_TRANSLATION_CACHE_SIZE (1024 * 384 * 2)
-  #define TRANSLATION_CACHE_LIMIT_THRESHOLD (1024 * 32)
-#endif
-
-#define STUB_ARENA_SIZE  (4*1024)
-
 #if defined(HAVE_MMAP)
 extern u8* rom_translation_cache;
 extern u8* ram_translation_cache;
@@ -147,8 +137,8 @@ extern int sceBlock;
 #else
 extern u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE];
 extern u8 ram_translation_cache[RAM_TRANSLATION_CACHE_SIZE];
-extern u32 stub_arena[STUB_ARENA_SIZE];
 #endif
+extern u32 stub_arena[STUB_ARENA_SIZE / 4];
 extern u8 *rom_translation_ptr;
 extern u8 *ram_translation_ptr;
 
@@ -162,9 +152,6 @@ extern u32 translation_gate_target_pc[MAX_TRANSLATION_GATES];
 
 extern u32 in_interrupt;
 
-#define ROM_BRANCH_HASH_SIZE (1024 * 64)
-
-/* EDIT: Shouldn't this be extern ?! */
 extern u32 *rom_branch_hash[ROM_BRANCH_HASH_SIZE];
 
 void flush_translation_cache_rom(void);
-- 
cgit v1.2.3


From a494a3f00ee3bd35ee9ab76f8cd4f164da080113 Mon Sep 17 00:00:00 2001
From: David Guillen Fandos
Date: Thu, 25 Mar 2021 21:02:06 +0100
Subject: Move OAM update flag to a register

Fix a small bug in MIPS dynarec that affects non -G0 targets
---
 cpu.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cpu.h')

diff --git a/cpu.h b/cpu.h
index fc57626..2b250ca 100644
--- a/cpu.h
+++ b/cpu.h
@@ -85,7 +85,8 @@ typedef enum
   CPU_MODE          = 29,
   CPU_HALT_STATE    = 30,
   CHANGED_PC_STATUS = 31,
-  COMPLETED_FRAME   = 32
+  COMPLETED_FRAME   = 32,
+  OAM_UPDATED       = 33
 } ext_reg_numbers;
 
 typedef enum
@@ -146,7 +147,6 @@ extern u8 *ram_translation_ptr;
 
 extern u32 idle_loop_target_pc;
 extern u32 iwram_stack_optimize;
-extern u32 direct_map_vram;
 extern u32 translation_gate_targets;
 extern u32 translation_gate_target_pc[MAX_TRANSLATION_GATES];
 
-- 
cgit v1.2.3