diff options
| author |   Avi Kivity <avi@qumranet.com> | 2007-05-24 11:04:24 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-05-24 14:11:39 +0300 |
| commit | 3b15c57c04c5fa617cf0bcabe60ec1f496b4adb4 (patch) | |
| tree | 2f81143abab6dbaafab7402c67708c8893cb38d9 | |
| parent | b648c1fa117366d15f0ffe0aa4b179641b0dd39c (diff) | |
kvm: testsuite: change assembler comments to C commentskvm-26
this avoids errors from the C preprocessor on some distros.
| -rw-r--r-- | kvm/user/test/bootstrap.S | 10 | ||||
| -rw-r--r-- | kvm/user/test/cstart.S | 2 | ||||
| -rw-r--r-- | kvm/user/test/cstart64.S | 16 |
3 files changed, 14 insertions, 14 deletions
diff --git a/kvm/user/test/bootstrap.S b/kvm/user/test/bootstrap.S index 2e8b1c8be..516f5808b 100644 --- a/kvm/user/test/bootstrap.S +++ b/kvm/user/test/bootstrap.S @@ -1,6 +1,6 @@ -# -# minimal bootstrap to set up flat 32-bit protected mode -# +/* + * minimal bootstrap to set up flat 32-bit protected mode + */ bstart = 0xf0000 @@ -38,8 +38,8 @@ gdt_desc: gdt: .quad 0 - .quad 0x00cf9b000000ffff # flat 32-bit code segment - .quad 0x00cf93000000ffff # flat 32-bit data segment + .quad 0x00cf9b000000ffff // flat 32-bit code segment + .quad 0x00cf93000000ffff // flat 32-bit data segment gdt_end: . = 0xfff0 diff --git a/kvm/user/test/cstart.S b/kvm/user/test/cstart.S index bb57562cf..322df4869 100644 --- a/kvm/user/test/cstart.S +++ b/kvm/user/test/cstart.S @@ -9,7 +9,7 @@ stacktop: .section .init lea stacktop, %esp call main -1: # hlt +1: // hlt jmp 1b diff --git a/kvm/user/test/cstart64.S b/kvm/user/test/cstart64.S index d35c5f446..5026d6512 100644 --- a/kvm/user/test/cstart64.S +++ b/kvm/user/test/cstart64.S @@ -36,13 +36,13 @@ gdt64_desc: gdt64: .quad 0 - .quad 0x00af9b000000ffff # 64-bit code segment - .quad 0x00cf93000000ffff # 64-bit data segment - .quad 0x00affb000000ffff # 64-bit code segment (user) - .quad 0x00cff3000000ffff # 64-bit data segment (user) + .quad 0x00af9b000000ffff // 64-bit code segment + .quad 0x00cf93000000ffff // 64-bit data segment + .quad 0x00affb000000ffff // 64-bit code segment (user) + .quad 0x00cff3000000ffff // 64-bit data segment (user) tss_descr: - .quad 0x000089000000ffff # 64-bit avail tss - .quad 0 # tss high addr + .quad 0x000089000000ffff // 64-bit avail tss + .quad 0 // tss high addr gdt64_end: tss: @@ -58,7 +58,7 @@ tss: lgdt gdt64_desc mov %cr4, %eax - bts $5, %eax # pae + bts $5, %eax // pae mov %eax, %cr4 mov $ptl4, %eax @@ -95,7 +95,7 @@ start64: ltr %ax call main -1: # hlt +1: // hlt jmp 1b |