WebSVN – HelenOS-historic – Path Comparison – /

Ignore whitespace Rev 251 → Rev 252

 /SPARTAN/trunk/arch/amd64/include/asm.h
 ,13 → 53,13
 {
     __u8 out;
-    asm (
+    __asm__ volatile (
         "mov %1, %%dx;"
         "inb %%dx,%%al;"
         "mov %%al, %0;"
         :"=m"(out)
         :"m"(port)
-        :"%dx","%al"
+        :"%rdx","%rax"
         );
     return out;
 }
 ,13 → 66,13
 static inline __u8 outb(__u16 port,__u8 b)
 {
-    asm (
+    __asm__ volatile (
         "mov %0,%%dx;"
         "mov %1,%%al;"
         "outb %%al,%%dx;"
         :
         :"m"( port), "m" (b)
-        :"%dx","%al"
+        :"%rdx","%rax"
         );
 }

 /SPARTAN/trunk/arch/amd64/src/delay.S
 ,13 → 36,11
 .global asm_fake_loop
 asm_delay_loop:
-:  lahf
-    dec %edi
+:  dec %rdi
     jnz 0b
     ret
 asm_fake_loop:
-:  lahf
-    dec %edi
+:  dec %rdi
     jz 0b
     ret

 /SPARTAN/trunk/arch/amd64/src/asm_utils.S
 ,17 → 39,22
 .text
 .global interrupt_handlers
 .global panic_printf
-.global cpuid
 panic_printf:
     movq $halt, (%rsp)
     jmp printf
+.global memcpy
+memcpy:
+    jmp _memcpy
+.global cpuid
 .global has_cpuid
 .global rdtsc
 .global read_efer_flag
 .global set_efer_flag
 ## Determine CPUID support
 #
 # Return 0 in EAX if CPUID is not support, 1 if supported.

/SPARTAN/trunk/arch/amd64/src/amd64.c
92,7 → 92,6

void calibrate_delay_loop(void)
{
return;
i8254_calibrate_delay_loop();
i8254_normal_operation();
}

 /SPARTAN/trunk/arch/amd64/src/dummy.s
 ,12 → 43,11
 cpu_arch_init:
 cpu_sleep:
 cpu_print_report:
-fpu_init:
 dummy:
 :
     ret
-.global memcpy
-memcpy:
-    jmp _memcpy
+fpu_init:
+    fninit
+    ret