diff options
| -rw-r--r-- | sys/amd64/amd64/identcpu.c | 38 | ||||
| -rw-r--r-- | sys/i386/i386/identcpu.c | 38 |
2 files changed, 38 insertions, 38 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index 485d942..949c05f 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -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; \ "); /* diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index 485d942..949c05f 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -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; \ "); /* |
