ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reduce dynamic MPU code size with a loop

pull/9208/head
Kevin Bracey 2018-12-11 18:21:04 +02:00 committed by Cruz Monrreal II
parent 4f9b258a03
commit 60451368a8
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hal/mpu/mbed_mpu_v7m.c
View File

@ -195,13 +195,18 @@ void mbed_mpu_free()
__ISB(); __ISB();
} }
static void enable_region(bool enable, uint32_t region)
{
MPU->RNR = region;
MPU->RASR = (MPU->RASR & ~MPU_RASR_ENABLE_Msk) | (enable << MPU_RASR_ENABLE_Pos);
}
void mbed_mpu_enable_rom_wn(bool enable) void mbed_mpu_enable_rom_wn(bool enable)
{ {
// Flush memory writes before configuring the MPU. // Flush memory writes before configuring the MPU.
__DMB(); __DMB();
MPU->RNR = 0; enable_region(enable, 0);
MPU->RASR = (MPU->RASR & ~MPU_RASR_ENABLE_Msk) | (enable ? MPU_RASR_ENABLE_Msk : 0);
// Ensure changes take effect // Ensure changes take effect
__DSB(); __DSB();
@ -213,14 +218,9 @@ void mbed_mpu_enable_ram_xn(bool enable)
// Flush memory writes before configuring the MPU. // Flush memory writes before configuring the MPU.
__DMB(); __DMB();
MPU->RNR = 1; for (uint32_t region = 1; region <= 3; region++) {
MPU->RASR = (MPU->RASR & ~MPU_RASR_ENABLE_Msk) | (enable ? MPU_RASR_ENABLE_Msk : 0); enable_region(enable, region);
}
MPU->RNR = 2;
MPU->RASR = (MPU->RASR & ~MPU_RASR_ENABLE_Msk) | (enable ? MPU_RASR_ENABLE_Msk : 0);
MPU->RNR = 3;
MPU->RASR = (MPU->RASR & ~MPU_RASR_ENABLE_Msk) | (enable ? MPU_RASR_ENABLE_Msk : 0);
// Ensure changes take effect // Ensure changes take effect
__DSB(); __DSB();

20
hal/mpu/mbed_mpu_v8m.c
View File

@ -144,13 +144,18 @@ void mbed_mpu_free()
__ISB(); __ISB();
} }
static void enable_region(bool enable, uint32_t region)
{
MPU->RNR = region;
MPU->RLAR = (MPU->RLAR & ~MPU_RLAR_EN_Msk) | (enable << MPU_RLAR_EN_Pos);
}
void mbed_mpu_enable_rom_wn(bool enable) void mbed_mpu_enable_rom_wn(bool enable)
{ {
// Flush memory writes before configuring the MPU. // Flush memory writes before configuring the MPU.
__DMB(); __DMB();
MPU->RNR = 0; enable_region(enable, 0);
MPU->RLAR = (MPU->RLAR & ~MPU_RLAR_EN_Msk) | (enable ? MPU_RLAR_EN_Msk : 0);
// Ensure changes take effect // Ensure changes take effect
__DSB(); __DSB();
@ -162,14 +167,9 @@ void mbed_mpu_enable_ram_xn(bool enable)
// Flush memory writes before configuring the MPU. // Flush memory writes before configuring the MPU.
__DMB(); __DMB();
MPU->RNR = 1; for (uint32_t region = 1; region <= 3; region++) {
MPU->RLAR = (MPU->RLAR & ~MPU_RLAR_EN_Msk) | (enable ? MPU_RLAR_EN_Msk : 0); enable_region(enable, region);
}
MPU->RNR = 2;
MPU->RLAR = (MPU->RLAR & ~MPU_RLAR_EN_Msk) | (enable ? MPU_RLAR_EN_Msk : 0);
MPU->RNR = 3;
MPU->RLAR = (MPU->RLAR & ~MPU_RLAR_EN_Msk) | (enable ? MPU_RLAR_EN_Msk : 0);
// Ensure changes take effect // Ensure changes take effect
__DSB(); __DSB();