From c5357940ab0108b4102442d07825c44d5be0d22f Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Thu, 13 Jun 2013 02:02:53 +0200 Subject: hwstub: major improvement in the stub and the tools Fix the stub in many way to correctly detect the STMP family and act upon that. Drop some unused commands and bump version. Rewrite the tool to allows scripting in lua and load the register description from an XML file using the regtools. Introduce a new tool to load and run code using the hwstub (either binary format or Rockbox additive scramble format). Also switch to an optimise version of the memcpy/move/set functions to correctly handle alignement issue (like writing a full word/half-word when possible for registers which is crucial) Change-Id: Id1d5cfe0b1b47e8b43900d32c5cd6eafae6414f6 --- utils/hwstub/stmp/config.h | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'utils/hwstub/stmp/config.h') diff --git a/utils/hwstub/stmp/config.h b/utils/hwstub/stmp/config.h index 6bd995e147..9d6de07f33 100644 --- a/utils/hwstub/stmp/config.h +++ b/utils/hwstub/stmp/config.h @@ -18,8 +18,8 @@ * KIND, either express or implied. * ****************************************************************************/ -#ifndef __HWEMUL_CONFIG__ -#define __HWEMUL_CONFIG__ +#ifndef __HWSTUB_CONFIG__ +#define __HWSTUB_CONFIG__ #define MEMORYSIZE 0 #define STACK_SIZE 0x1000 @@ -30,4 +30,27 @@ #define DRAM_ORIG 0x40000000 #define DRAM_SIZE (MEMORYSIZE * 0x100000) -#endif /* __HWEMUL_CONFIG__ */ +#define CPU_ARM +#define ARM_ARCH 5 + +#if defined(CPU_ARM) && defined(__ASSEMBLER__) +/* ARMv4T doesn't switch the T bit when popping pc directly, we must use BX */ +.macro ldmpc cond="", order="ia", regs +#if ARM_ARCH == 4 && defined(USE_THUMB) + ldm\cond\order sp!, { \regs, lr } + bx\cond lr +#else + ldm\cond\order sp!, { \regs, pc } +#endif +.endm +.macro ldrpc cond="" +#if ARM_ARCH == 4 && defined(USE_THUMB) + ldr\cond lr, [sp], #4 + bx\cond lr +#else + ldr\cond pc, [sp], #4 +#endif +.endm +#endif + +#endif /* __HWSTUB_CONFIG__ */ -- cgit v1.2.3