Changeset 94

Timestamp:

Jun 29, 2017, 1:27:43 PM (7 years ago)

Author:

max@…

Message:

remove lw_unc, add a few ops, and update a few things

Location:

trunk/hal/x86_64/core

Files:

• hal_cpu.S (modified) (2 diffs)
• hal_drivers.c (modified) (1 diff)
• hal_init.c (modified) (1 diff)
• hal_internal.h (modified) (2 diffs)
• hal_remote.c (modified) (1 diff)
• hal_special.c (modified) (1 diff)
• x86_printf.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_cpu.S

@@ -56 +56 @@
         ret
 
+ASM_ENTRY(rdtsc)
+        xorq    %rax,%rax
+        rdtsc
+        shlq    $32,%rdx
+        orq     %rdx,%rax
+        ret
+
 ASM_ENTRY(in8)
         movq    %rdi,%rdx
@@ -88 +95 @@
         ret
 
+/* -------------------------------------------------------------------------- */
+
+ASM_ENTRY(atomic_cas_32)
+        movl    %esi,%eax
+        lock
+        cmpxchgl %edx,(%rdi)
+        /* %eax now contains the old value */
+        ret
+
+ASM_ENTRY(atomic_add_32)
+        lock
+        addl    %esi,(%rdi)
+        ret
+

trunk/hal/x86_64/core/hal_drivers.c

@@ -27 +27 @@
 void hal_drivers_txt_init(chdev_t *dev)
 {
-        x86_panic((char *)__func__);
+        soclib_tty_init(dev);
 }
 

trunk/hal/x86_64/core/hal_init.c

@@ -178 +178 @@
 
         x86_printf("-> mytest = %z\n", mytest);
-
+        void *hoho = &init_x86_64;
         xptr_t myptr = XPTR(0, &mytest);
-        hal_remote_sb(myptr, 1);
-        x86_printf("-> mytest = %z\n", hal_remote_lb(myptr));
+
+        hal_remote_atomic_add(myptr, 3);
+        x86_printf("-> mytest = %z\n", mytest);
+
+        hal_remote_spt(myptr, hoho);
+        x86_printf("-> mytest = %Z\n", hal_remote_lpt(myptr));
+
 
         init_bootinfo(&btinfo);

trunk/hal/x86_64/core/hal_internal.h

@@ -35 +35 @@
 void sti();
 void cli();
+uint64_t rdtsc();
 uint8_t in8(uint32_t port);
 void out8(uint32_t port, uint8_t val);
 uint64_t rdmsr(uint32_t);
 void wrmsr(uint32_t, uint64_t);
+
+uint32_t atomic_cas_32(volatile uint32_t *ptr, uint32_t exp, uint32_t new);
+void atomic_add_32(volatile uint32_t *ptr, int32_t incr);
 
 /* hal_gpt.c */
@@ -55 +59 @@
 /* x86_printf.c */
 void x86_panic(char *msg);
+void x86_putc(char c);
 void x86_printf(char *s, ...);
 

trunk/hal/x86_64/core/hal_remote.c

@@ -70 +70 @@
 }
 
-uint32_t hal_remote_lw_unc( xptr_t  xp )
-{
-        x86_panic((char *)__func__);
-        return 0;
-}
-
 bool_t hal_remote_atomic_cas( xptr_t    xp,
                               uint32_t  old,
                               uint32_t  new )
 {
-        x86_panic((char *)__func__);
-        return 0;
+        return atomic_cas_32((volatile uint32_t *)xp, old, new);
 }
 
 uint32_t hal_remote_atomic_add( xptr_t   xp, 
-                                uint32_t incr )
+                                uint32_t incr ) // XXX define as signed
 {
-        x86_panic((char *)__func__);
-        return 0;
+        atomic_add_32((volatile uint32_t *)xp, incr);
 }
 

trunk/hal/x86_64/core/hal_special.c

@@ -75 +75 @@
 uint32_t hal_time_stamp()
 {
-        x86_panic((char *)__func__);
-        return 0;
+        return (uint32_t)rdtsc(); // XXX will be fixed soon
 }
 
 struct thread_s * hal_get_current_thread()
 {
-        x86_panic((char *)__func__);
         return curcpu()->ci_thr;
 }

trunk/hal/x86_64/core/x86_printf.c

@@ -74 +74 @@
 }
 
-static void x86_putc(char c)
+void x86_putc(char c)
 {
         if (c == '\n') {