diff options
author | obrien <obrien@FreeBSD.org> | 2009-01-31 11:37:21 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2009-01-31 11:37:21 +0000 |
commit | 7a153194ec575997818d16f6ee3e0c909e8be1f8 (patch) | |
tree | fa33158175bc2ce89cbc4c08ceb6b91986a5f004 /sys/i386 | |
parent | f922834f0ff4f9828f5d96879cb808391ec87b82 (diff) | |
download | FreeBSD-src-7a153194ec575997818d16f6ee3e0c909e8be1f8.zip FreeBSD-src-7a153194ec575997818d16f6ee3e0c909e8be1f8.tar.gz |
Change some movl's to mov's. Newer GAS no longer accept 'movl' instructions
for moving between a segment register and a 32-bit memory location.
Looked at by: jhb
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/i386/locore.s | 6 | ||||
-rw-r--r-- | sys/i386/i386/swtch.s | 6 | ||||
-rw-r--r-- | sys/i386/include/cpufunc.h | 10 | ||||
-rw-r--r-- | sys/i386/linux/linux_locore.s | 4 | ||||
-rw-r--r-- | sys/i386/svr4/svr4_locore.s | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index 7ca2493..94ac670 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -338,7 +338,7 @@ NON_GPROF_ENTRY(sigcode) pushl %eax testl $PSL_VM,UC_EFLAGS(%eax) jne 1f - movl UC_GS(%eax),%gs /* restore %gs */ + mov UC_GS(%eax),%gs /* restore %gs */ 1: movl $SYS_sigreturn,%eax pushl %eax /* junk to fake return addr. */ @@ -355,7 +355,7 @@ freebsd4_sigcode: pushl %eax testl $PSL_VM,UC4_EFLAGS(%eax) jne 1f - movl UC4_GS(%eax),%gs /* restore %gs */ + mov UC4_GS(%eax),%gs /* restore %gs */ 1: movl $344,%eax /* 4.x SYS_sigreturn */ pushl %eax /* junk to fake return addr. */ @@ -373,7 +373,7 @@ osigcode: pushl %eax testl $PSL_VM,SC_PS(%eax) jne 9f - movl SC_GS(%eax),%gs /* restore %gs */ + mov SC_GS(%eax),%gs /* restore %gs */ 9: movl $103,%eax /* 3.x SYS_sigreturn */ pushl %eax /* junk to fake return addr. */ diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s index 27a0094..0c07871 100644 --- a/sys/i386/i386/swtch.s +++ b/sys/i386/i386/swtch.s @@ -130,7 +130,7 @@ ENTRY(cpu_switch) movl %ebp,PCB_EBP(%edx) movl %esi,PCB_ESI(%edx) movl %edi,PCB_EDI(%edx) - movl %gs,PCB_GS(%edx) + mov %gs,PCB_GS(%edx) pushfl /* PSL */ popl PCB_PSL(%edx) /* Test if debug registers should be saved. */ @@ -313,7 +313,7 @@ sw1: /* This must be done after loading the user LDT. */ .globl cpu_switch_load_gs cpu_switch_load_gs: - movl PCB_GS(%edx),%gs + mov PCB_GS(%edx),%gs /* Test if debug registers should be restored. */ testl $PCB_DBREGS,PCB_FLAGS(%edx) @@ -383,7 +383,7 @@ ENTRY(savectx) movl %ebp,PCB_EBP(%ecx) movl %esi,PCB_ESI(%ecx) movl %edi,PCB_EDI(%ecx) - movl %gs,PCB_GS(%ecx) + mov %gs,PCB_GS(%ecx) pushfl popl PCB_PSL(%ecx) diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 4bf93b1..ad5fc4c 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -497,7 +497,7 @@ static __inline u_int rfs(void) { u_int sel; - __asm __volatile("movl %%fs,%0" : "=rm" (sel)); + __asm __volatile("mov %%fs,%0" : "=rm" (sel)); return (sel); } @@ -513,7 +513,7 @@ static __inline u_int rgs(void) { u_int sel; - __asm __volatile("movl %%gs,%0" : "=rm" (sel)); + __asm __volatile("mov %%gs,%0" : "=rm" (sel)); return (sel); } @@ -537,7 +537,7 @@ static __inline u_int rss(void) { u_int sel; - __asm __volatile("movl %%ss,%0" : "=rm" (sel)); + __asm __volatile("mov %%ss,%0" : "=rm" (sel)); return (sel); } @@ -552,13 +552,13 @@ rtr(void) static __inline void load_fs(u_int sel) { - __asm __volatile("movl %0,%%fs" : : "rm" (sel)); + __asm __volatile("mov %0,%%fs" : : "rm" (sel)); } static __inline void load_gs(u_int sel) { - __asm __volatile("movl %0,%%gs" : : "rm" (sel)); + __asm __volatile("mov %0,%%gs" : : "rm" (sel)); } static __inline void diff --git a/sys/i386/linux/linux_locore.s b/sys/i386/linux/linux_locore.s index 044e8e2..a3e0e7dc 100644 --- a/sys/i386/linux/linux_locore.s +++ b/sys/i386/linux/linux_locore.s @@ -8,7 +8,7 @@ NON_GPROF_ENTRY(linux_sigcode) call *LINUX_SIGF_HANDLER(%esp) leal LINUX_SIGF_SC(%esp),%ebx /* linux scp */ - movl LINUX_SC_GS(%ebx),%gs + mov LINUX_SC_GS(%ebx),%gs movl %esp, %ebx /* pass sigframe */ push %eax /* fake ret addr */ movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */ @@ -20,7 +20,7 @@ linux_rt_sigcode: call *LINUX_RT_SIGF_HANDLER(%esp) leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */ leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */ - movl LINUX_SC_GS(%ecx),%gs + mov LINUX_SC_GS(%ecx),%gs push %eax /* fake ret addr */ movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */ int $0x80 /* enter kernel with args */ diff --git a/sys/i386/svr4/svr4_locore.s b/sys/i386/svr4/svr4_locore.s index 6274ad2..8c0c60a 100644 --- a/sys/i386/svr4/svr4_locore.s +++ b/sys/i386/svr4/svr4_locore.s @@ -14,7 +14,7 @@ NON_GPROF_ENTRY(svr4_sigcode) testl $PSL_VM,SVR4_UC_EFLAGS(%eax) jnz 1f #endif - movl SVR4_UC_GS(%eax),%gs + mov SVR4_UC_GS(%eax),%gs 1: pushl %eax # pointer to ucontext pushl $1 # set context movl $svr4_sys_context,%eax |