Changeset 98

Timestamp:

Jun 29, 2017, 2:27:35 PM (7 years ago)

Author:

max@…

Message:

add the and/or ops

Location:

trunk/hal/x86_64/core

Files:

• hal_cpu.S (modified) (1 diff)
• hal_internal.h (modified) (1 diff)
• hal_remote.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_cpu.S

@@ -111 +111 @@
         ret
 
+ASM_ENTRY(atomic_and_32)
+        movl    (%rdi),%eax
+1:
+        movl    %eax,%ecx
+        andl    %esi,%ecx
+        lock
+        cmpxchgl %ecx,(%rdi)
+        jnz     1b
+        /* %eax now contains the old value */
+        ret
+
+ASM_ENTRY(atomic_or_32)
+        movl    (%rdi),%eax
+1:
+        movl    %eax,%ecx
+        orl     %esi,%ecx
+        lock
+        cmpxchgl %ecx,(%rdi)
+        jnz     1b
+        /* %eax now contains the old value */
+        ret
+

trunk/hal/x86_64/core/hal_internal.h

@@ -43 +43 @@
 uint32_t atomic_cas_32(volatile uint32_t *ptr, uint32_t exp, uint32_t new);
 uint32_t atomic_add_32(volatile uint32_t *ptr, int32_t incr);
+uint32_t atomic_and_32(volatile uint32_t *ptr, uint32_t mask);
+uint32_t atomic_or_32(volatile uint32_t *ptr, uint32_t mask);
 
 /* hal_gpt.c */

trunk/hal/x86_64/core/hal_remote.c

@@ -86 +86 @@
                                 uint32_t mask )
 {
-        x86_panic((char *)__func__);
-        return 0;
+        return atomic_and_32((volatile uint32_t *)xp, mask);
 }
 
@@ -93 +92 @@
                                uint32_t mask )
 {
-        x86_panic((char *)__func__);
-        return 0;
+        return atomic_or_32((volatile uint32_t *)xp, mask);
 }