fix(defs): Add conditional macros to defines generation and use

Signed-off-by: Miguel Silva <[email protected]>

Author: miguelafsilva5

src/arch/armv8/aarch32/exceptions.S

@@ -50,11 +50,13 @@
     push {r0-r12}
     SAVE_ELR_SPSR
 
+#ifndef MEM_PROT_MMU
     mrc p15, 4, r0, c13, c0, 2  // Read HTPIDR (CPU base address)
     mov r1, #CPU_VCPU_OFF
     ldr r0, [r0, r1]
     add r0, r0, #CPU_AS_ARCH_MASK_OFF
     mcr p15, 4, r0, c6, c1, 1 //HPRENR
+#endif
 
     //cpu.as.arch.entry_mask
     //trocar HPRENR
@@ -145,7 +147,7 @@
     
     mrc p15, 4, r0, c13, c0, 2  // Read HTPIDR (CPU base address)
 
-//#ifdef MEM_PROT_MPU   //0x2043a780
+#ifndef MEM_PROT_MMU   //0x2043a780
     //trocar o HPRENR
     //cpu->vcpu->vm->as.arch.entry_mask | cpu.arch.profile.mpu.locked
     ldr r1, [r0, #CPU_VCPU_OFF]
@@ -160,7 +162,7 @@
 
     orr r1, r1, r2
     mcr p15, 4, r1, c6, c1, 1 //HPRENR
-//#endif
+#endif
 
     ldr r0, [r0, #CPU_VCPU_OFF]
     add r0, r0, #VCPU_REGS_OFF

src/arch/armv8/asm_defs.c

@@ -17,8 +17,11 @@ __attribute__((used)) static void cpu_defines(void)
     DEFINE_SIZE(CPU_STACK_SIZE, ((struct cpu*)NULL)->stack);
 
     DEFINE_OFFSET(CPU_VCPU_OFF, struct cpu, vcpu);
+
+#ifndef MEM_PROT_MMU
     DEFINE_OFFSET(CPU_AS_ARCH_MASK_OFF, struct cpu, as.arch.entry_mask);
     DEFINE_OFFSET(CPU_ARCH_PROFILE_MPU_LOCKED_OFF, struct cpu, arch.profile.mpu.locked);
+#endif
 }
 
 __attribute__((used)) static void vcpu_defines(void)
@@ -28,7 +31,9 @@ __attribute__((used)) static void vcpu_defines(void)
     DEFINE_OFFSET(VCPU_VM_OFF, struct vcpu, vm);
     DEFINE_SIZE(VCPU_REGS_SIZE, struct arch_regs);
 
+#ifndef MEM_PROT_MMU
     DEFINE_OFFSET(VM_AS_ARCH_MASK_OFF, struct vm, as.arch.entry_mask);
+#endif
 }
 
 __attribute__((used)) static void platform_defines(void)