Make CONFIG_MMU_REMAP work for RP.160

platform/RP.160/consts.h

@@ -9,6 +9,11 @@
 #define LEDON                          0x004D0002
 #define LEDOFF                         0x004C0003
 
+#define CANON_ORIG_MMU_TABLE_ADDR 0xe0000000 // Yes, this is the rom start, yes, there is code there.
+                                             // I assume ARM MMU alignment magic means this is okay,
+                                             // presumably the tables themselves don't use the early part.
+                                             // I don't have an exact ref in ARM manual.
+
 #define BR_DCACHE_CLN_1      0xE0040068   /* first call to dcache_clean, before cstart */
 #define BR_ICACHE_INV_1      0xE0040072   /* first call to icache_invalidate, before cstart */
 #define BR_DCACHE_CLN_2      0xE00400A0   /* second call to dcache_clean, before cstart */
@@ -38,6 +43,7 @@
 //#define MALLOC_FREE_MEMORY (MEM(MALLOC_STRUCT + 8) - MEM(MALLOC_STRUCT + 0x1C)) // "Total Size" - "Allocated Size"
 
 #define DRYOS_ASSERT_HANDLER 0x4000               // from debug_assert function, hard to miss
+#define DRYOS_SGI_HANDLERS_PTR 0x402c             // holds pointer to base of SGI handlers (each is 8 bytes, a pointer and something else)
 
 #define CURRENT_GUI_MODE (*(int*)0x7a50) // see SetGUIRequestMode
 

platform/RP.160/include/platform/mmu_patches.h

@@ -0,0 +1,25 @@
+#ifndef __PLATFORM_MMU_PATCHES_H__
+#define __PLATFORM_MMU_PATCHES_H__
+
+#include "patch.h"
+
+#if CONFIG_FW_VERSION == 160 // ensure our hard-coded patch addresses are not broken
+                             // by a FW upgrade
+struct patch early_data_patches[] =
+{
+};
+
+struct patch normal_data_patches[] =
+{
+};
+
+struct function_hook_patch early_code_patches[] =
+{
+};
+
+struct function_hook_patch normal_code_patches[] =
+{
+};
+
+#endif // RP FW_VERSION 160
+#endif // __PLATFORM_MMU_PATCHES_H__

platform/RP.160/stubs.S

@@ -39,6 +39,7 @@ THUMB_FN(0xE0040104,  cstart)                          /* calls bzero32 and crea
 THUMB_FN(0xE05A6CDC,  bzero32)                         /* zeros out a data structure */
 THUMB_FN(0xE05C04A4,  create_init_task)                /* low-level DryOS initialization */
 THUMB_FN(0xE05A9F08,  dcache_clean)                    /* loop with MCR p15 c7,c10,1; DSB */
+THUMB_FN(0xE000c184,  dcache_clean_multicore) /* loop writing to c11007b0, called after dcache_clean by copy_mmu_tables() */
 THUMB_FN(0xE05A9FDC,  icache_invalidate)               /* loop with MCR p15 c7,c5,1; c7,c1,6; c7,c1,0; ISB */
 THUMB_FN(0xE004022C,  init_task)                       /* USER_MEM size checking, dmSetup, termDriverInit, stdlibSetup etc */
 
@@ -47,6 +48,7 @@ DATA_PTR(    0x1010,  current_interrupt)               /* from interrupt handler
 DATA_PTR(    0x1028,  current_task)                    /* from task_create; pointer to the current task structure */
 THUMB_FN(0xE058F77A,  msleep)                          /* argument is always multiple of 10 */
 THUMB_FN(0xE05DA6C2,  task_create)                     /* used to start TaskMain, GuiMainTask etc */
+THUMB_FN(0xe05da8da,  task_create_ex)         /* as task_create, but allows selecting CPU for task*/
 
 /** Misc (Optional) **/
 THUMB_FN(0xE059100C,  uart_printf)                     // The function which prints Kxxx READY.
@@ -119,6 +121,22 @@ THUMB_FN(0xE057EA20,  SetTimerAfter)                   // function after create
 THUMB_FN(0xE038AA1A,  CancelDateTimer)                 // "CancelDateTimer" string inside function
 THUMB_FN(0xE057EAD6,  CancelTimer)                     // function call after "CancelTimer FocusProhibit %d"
 
+THUMB_FN(0xe13ec7de, _request_RPC) // allows CPU0 or CPU1 to pass a func pointer and param
+                                   // to the other for RPC.
+                                   // Passing a NULL func pointer, will suspend the other
+                                   // CPU until it becomes non-NULL.
+                                   // DryOS seems to use this to deliberately sleep a CPU
+                                   // in some exceptional cases (e.g. asserts).
+                                   //
+                                   // Don't call this directly, because if you do,
+                                   // and you forget to call clear_RPC_request(),
+                                   // the target CPU will repeatedly call the func pointer
+                                   // as fast as possible, forever.
+                                   // Instead use request_RPC().
+
+THUMB_FN(0xe13ec7fe, clear_RPC_request) // reset the request to prevent calling
+                                        // the function forever
+
 /** MPU communication **/
 // THUMB_FN(0xE05da06c,  mpu_recv)                        // passed as last argument by InitializeIntercom and eventually stored into mpu_recv_cbr
 // DATA_PTR(    0xA388,  mpu_recv_cbr)                    // mpu_recv is called indirectly through this function pointer
@@ -256,6 +274,13 @@ DATA_PTR(    0x14844,  LiveViewApp_dialog)                 // in StartLiveViewAp
 //DATA_PTR(  0x1e488,  LiveViewShutterApp_dialog)          // in StartLiveViewShutterApp(), not sure if needed
 //DATA_PTR(  0x16338,  PlayMovieGuideApp_dialog)           // in PlayMovieGuide_Start()
 
+// MMU related, required by CONFIG_MMU features
+// slightly MMU related, used by CONFIG_MMU_REMAP
+THUMB_FN(0xe0004ae2, change_mmu_tables) // Updates TTBRs and does TLB maintenance
+ARM32_FN(0xe001803c, memcpy_dryos) // useful in early contexts when we don't have
+                                   // dietlibc or newlib, and can't use stdio memcpy64 because
+                                   // that wants ML assert handling initialised.
+
 /**
  * STUFF BELOW IS WRONG!
  **/