Changeset 336

Timestamp:

Aug 7, 2017, 11:22:15 AM (7 years ago)

Author:

max@…

Message:

Rename curcpu -> curtls.

Location:

trunk/hal/x86_64/core

Files:

• hal_exception.c (modified) (1 diff)
• hal_interrupt.c (modified) (1 diff)
• hal_irqmask.c (modified) (3 diffs)
• hal_segmentation.h (modified) (1 diff)
• hal_special.c (modified) (3 diffs)

trunk/hal/x86_64/core/hal_exception.c

@@ -76 +76 @@
         x86_printf("-> rdi = %Z\n", ctx->tf_rdi);
         x86_printf("-> rbp = %Z\n", ctx->tf_rbp);
-        x86_printf("-> tls = %Z (gid=%Z)\n", (uint64_t)curcpu(),
+        x86_printf("-> tls = %Z (gid=%Z)\n", (uint64_t)curtls(),
             (uint64_t)hal_get_gid());
         x86_printf("-> err = %Z\n", ctx->tf_err);

trunk/hal/x86_64/core/hal_interrupt.c

@@ -48 +48 @@
 
         core_t *core = CURRENT_THREAD->core;
-        curcpu()->tls_tf = tf;
+        curtls()->tls_tf = tf;
 
         core_clock(core);

trunk/hal/x86_64/core/hal_irqmask.c

@@ -26 +26 @@
 inline void hal_disable_irq(reg_t *old)
 {
-        tls_t *tls = curcpu();
+        tls_t *tls = curtls();
 
         *old = tls->tls_intr;
@@ -36 +36 @@
 inline void hal_enable_irq(reg_t *old)
 {
-        tls_t *tls = curcpu();
+        tls_t *tls = curtls();
 
         *old = tls->tls_intr;
@@ -46 +46 @@
 inline void hal_restore_irq(reg_t old)
 {
-        tls_t *tls = curcpu();
+        tls_t *tls = curtls();
 
         tls->tls_intr = old;

trunk/hal/x86_64/core/hal_segmentation.h

@@ -163 +163 @@
 void lidt(struct region_descriptor *);
 void ltr(uint16_t);
-tls_t *curcpu();
+tls_t *curtls();
 
 #define INTRS_ENABLED   0xFFEFAAAA

trunk/hal/x86_64/core/hal_special.c

@@ -32 +32 @@
 struct thread_s;
 
-tls_t *curcpu()
+tls_t *curtls()
 {
         tls_t *cputls;
@@ -45 +45 @@
 gid_t hal_get_gid()
 {
-        return curcpu()->tls_gid;
+        return curtls()->tls_gid;
 }
 
@@ -75 +75 @@
 struct thread_s *hal_get_current_thread()
 {
-        return curcpu()->tls_thr;
+        return curtls()->tls_thr;
 }
 
 void hal_set_current_thread( struct thread_s * thread )
 {
-        curcpu()->tls_thr = thread;
+        curtls()->tls_thr = thread;
 }