Browse Source

[LibOS] Rename SHIM_TLS_CANARY -> SHIM_TCB_CANARY

Isaku Yamahata 5 years ago
parent
commit
51b4714e2c
2 changed files with 3 additions and 3 deletions
  1. 2 2
      LibOS/shim/include/shim_tcb.h
  2. 1 1
      LibOS/shim/src/shim_init.c

+ 2 - 2
LibOS/shim/include/shim_tcb.h

@@ -3,7 +3,7 @@
 
 #include <atomic.h>
 
-#define SHIM_TLS_CANARY 0xdeadbeef
+#define SHIM_TCB_CANARY 0xdeadbeef
 
 struct shim_regs {
     unsigned long           orig_rax;
@@ -69,7 +69,7 @@ static inline bool shim_tcb_check_canary(void)
 {
     /* TODO: optimize to use single movq %gs:<offset> */
     shim_tcb_t * shim_tcb = shim_get_tcb();
-    return shim_tcb->canary == SHIM_TLS_CANARY;
+    return shim_tcb->canary == SHIM_TCB_CANARY;
 }
 
 #endif /* _SHIM_H_ */

+ 1 - 1
LibOS/shim/src/shim_init.c

@@ -201,7 +201,7 @@ bool lock_enabled;
 
 void init_tcb (shim_tcb_t * tcb)
 {
-    tcb->canary = SHIM_TLS_CANARY;
+    tcb->canary = SHIM_TCB_CANARY;
     tcb->self = tcb;
 }