portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ia32: Use unsigned long for reading / writing machine cpu registers

Browse source 
Using an unsigned long instead of forcing to 32bits allows this code
to be reused in a 64-bit context
This commit is contained in:
Adrian Danis 2015-05-19 16:08:27 +10:00
parent 2637108626
commit 481bdffa99
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/arch/ia32/arch/machine/cpu_registers.h
View file

@ -21,47 +21,47 @@
/* We use a dummy variable to synchronize reads and writes to the control registers.
* this allows us to write inline asm blocks that do not have enforced memory
* clobbers for ordering. */
static uint32_t __control_reg_order;
static unsigned long __control_reg_order;
static inline uint32_t read_cr3(void)
static inline unsigned long read_cr3(void)
{
uint32_t val;
unsigned long val;
asm volatile("movl %%cr3, %0" : "=r"(val), "=m"(__control_reg_order));
return val;
}
static inline void write_cr3(uint32_t val)
static inline void write_cr3(unsigned long val)
{
asm volatile("movl %0, %%cr3" :: "r"(val), "m"(__control_reg_order));
}
static inline uint32_t read_cr0(void)
static inline unsigned long read_cr0(void)
{
uint32_t val;
unsigned long val;
asm volatile("movl %%cr0, %0" : "=r"(val), "=m"(__control_reg_order));
return val;
}
static inline void write_cr0(uint32_t val)
static inline void write_cr0(unsigned long val)
{
asm volatile("movl %0, %%cr0" :: "r"(val), "m"(__control_reg_order));
}
static inline uint32_t read_cr2(void)
static inline unsigned long read_cr2(void)
{
uint32_t val;
unsigned long val;
asm volatile("movl %%cr2, %0" : "=r"(val), "=m"(__control_reg_order));
return val;
}
static inline uint32_t read_cr4(void)
static inline unsigned long read_cr4(void)
{
uint32_t val;
unsigned long val;
asm volatile("movl %%cr4, %0" : "=r"(val), "=m"(__control_reg_order));
return val;
}
static inline void write_cr4(uint32_t value)
static inline void write_cr4(unsigned long value)
{
asm volatile("movl %0, %%cr4" :: "r"(value), "m"(__control_reg_order));
}