Changeset 0b05082 in mainline for uspace/lib/c/arch/mips32/include/libarch/tls.h

Timestamp:

2018-07-18T18:56:16Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

40abf56

Parents:

9b1baac

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-18 14:25:11)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-18 18:56:16)

Message:

Adds

• tcb_raw_get(), which returns the value of the TP register without any offsets applied to it,
• tcb_raw_set(), which does the opposite,
• tcb_is_set(), which returns true iff the register is not NULL,
• tcb_reset(), which sets the register to NULL.

Used for debug assertions.

File:

• uspace/lib/c/arch/mips32/include/libarch/tls.h (modified) (2 diffs)

uspace/lib/c/arch/mips32/include/libarch/tls.h

@@ -61 +61 @@
  * - No assumption about DTV etc., but it will not have a fixed address
  */
-#define MIPS_TP_OFFSET 0x7000
+#define ARCH_TP_OFFSET (0x7000 + sizeof(tcb_t))
 
 typedef struct {
@@ -67 +67 @@
 } tcb_t;
 
-static inline void __tcb_set(tcb_t *tcb)
+static inline void __tcb_raw_set(void *tls)
 {
-        uint8_t *tp = (uint8_t *) tcb;
-        tp += MIPS_TP_OFFSET + sizeof(tcb_t);
-
-        asm volatile ("add $27, %0, $0" : : "r" (tp)); /* Move tls to K1 */
+        /* Move tls to K1 */
+        asm volatile ("add $27, %0, $0" :: "r" (tls));
 }
 
-static inline tcb_t *__tcb_get(void)
+static inline void *__tcb_raw_get(void)
 {
-        uint8_t *retval;
-
+        void *retval;
         asm volatile ("add %0, $27, $0" : "=r" (retval));
-
-        return (tcb_t *)(retval - MIPS_TP_OFFSET - sizeof(tcb_t));
+        return retval;
 }