d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcc-3 has objections about the bluetrap6 and bluetrap13 inline asm

Browse Source 
functions.  Apparently multi-line string asm arguments are deprecated.
This commit is contained in:
Peter Wemm 2001-09-10 04:22:20 +00:00
parent 22c1cd205e
commit e11e07928b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=83275
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/amd64/amd64/identcpu.c
View File

@ -693,15 +693,15 @@ static volatile u_int trap_by_rdmsr;
*/
inthand_t bluetrap6;
__asm
("
.text
.p2align 2,0x90
.type " __XSTRING(CNAME(bluetrap6)) ",@function
" __XSTRING(CNAME(bluetrap6)) ":
ss
movl $0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "
addl $2, (%esp) # I know rdmsr is a 2-bytes instruction.
iret
(" \
.text; \
.p2align 2,0x90; \
.type " __XSTRING(CNAME(bluetrap6)) ",@function; \
" __XSTRING(CNAME(bluetrap6)) ": \
ss; \
movl $0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "; \
addl $2, (%esp); /* rdmsr is a 2-byte instruction */ \
iret \
");
/*
@ -710,16 +710,16 @@ __asm
*/
inthand_t bluetrap13;
__asm
("
.text
.p2align 2,0x90
.type " __XSTRING(CNAME(bluetrap13)) ",@function
" __XSTRING(CNAME(bluetrap13)) ":
ss
movl $0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "
popl %eax # discard errorcode.
addl $2, (%esp) # I know rdmsr is a 2-bytes instruction.
iret
(" \
.text; \
.p2align 2,0x90; \
.type " __XSTRING(CNAME(bluetrap13)) ",@function; \
" __XSTRING(CNAME(bluetrap13)) ": \
ss; \
movl $0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "; \
popl %eax; /* discard errorcode. */ \
addl $2, (%esp); /* rdmsr is a 2-bytes instruction. */ \
iret; \
");
/*

38
sys/i386/i386/identcpu.c
View File

@ -693,15 +693,15 @@ static volatile u_int trap_by_rdmsr;
*/
inthand_t bluetrap6;
__asm
("
.text
.p2align 2,0x90
.type " __XSTRING(CNAME(bluetrap6)) ",@function
" __XSTRING(CNAME(bluetrap6)) ":
ss
movl $0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "
addl $2, (%esp) # I know rdmsr is a 2-bytes instruction.
iret
(" \
.text; \
.p2align 2,0x90; \
.type " __XSTRING(CNAME(bluetrap6)) ",@function; \
" __XSTRING(CNAME(bluetrap6)) ": \
ss; \
movl $0xa8c1d," __XSTRING(CNAME(trap_by_rdmsr)) "; \
addl $2, (%esp); /* rdmsr is a 2-byte instruction */ \
iret \
");
/*
@ -710,16 +710,16 @@ __asm
*/
inthand_t bluetrap13;
__asm
("
.text
.p2align 2,0x90
.type " __XSTRING(CNAME(bluetrap13)) ",@function
" __XSTRING(CNAME(bluetrap13)) ":
ss
movl $0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "
popl %eax # discard errorcode.
addl $2, (%esp) # I know rdmsr is a 2-bytes instruction.
iret
(" \
.text; \
.p2align 2,0x90; \
.type " __XSTRING(CNAME(bluetrap13)) ",@function; \
" __XSTRING(CNAME(bluetrap13)) ": \
ss; \
movl $0xa89c4," __XSTRING(CNAME(trap_by_rdmsr)) "; \
popl %eax; /* discard errorcode. */ \
addl $2, (%esp); /* rdmsr is a 2-bytes instruction. */ \
iret; \
");
/*