Changeset 7328ff4 in mainline for kernel/arch/mips32/src/debugger.c

Timestamp:

2018-09-06T18:18:52Z (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:

ffa73c6

Parents:

d51cca8

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-13 01:29:17)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-06 18:18:52)

Message:

Use builtin memory fences for kernel barriers, and convert smp_coherence() into a regular function

File:

• kernel/arch/mips32/src/debugger.c (modified) (5 diffs)

kernel/arch/mips32/src/debugger.c

@@ -147 +147 @@
 }
 
+static inline void write_inst(uintptr_t addr, uint32_t inst)
+{
+        *((uint32_t *) addr) = inst;
+        smc_coherence((uint32_t *) addr, 4);
+}
+
 #ifdef CONFIG_KCONSOLE
 
@@ -212 +218 @@
 
         /* Set breakpoint */
-        *((sysarg_t *) cur->address) = 0x0d;
-        smc_coherence(cur->address, 4);
+        write_inst(cur->address, 0x0d);
 
         irq_spinlock_unlock(&bkpoint_lock, true);
@@ -245 +250 @@
         }
 
-        ((uint32_t *) cur->address)[0] = cur->instruction;
-        smc_coherence(((uint32_t *) cur->address)[0], 4);
-        ((uint32_t *) cur->address)[1] = cur->nextinstruction;
-        smc_coherence(((uint32_t *) cur->address)[1], 4);
+        write_inst(cur->address, cur->instruction);
+        write_inst(cur->address + 4, cur->nextinstruction);
 
         cur->address = (uintptr_t) NULL;
@@ -357 +360 @@
                 if (cur->flags & BKPOINT_REINST) {
                         /* Set breakpoint on first instruction */
-                        ((uint32_t *) cur->address)[0] = 0x0d;
-                        smc_coherence(((uint32_t *)cur->address)[0], 4);
+                        write_inst(cur->address, 0x0d);
 
                         /* Return back the second */
-                        ((uint32_t *) cur->address)[1] = cur->nextinstruction;
-                        smc_coherence(((uint32_t *) cur->address)[1], 4);
+                        write_inst(cur->address + 4, cur->nextinstruction);
 
                         cur->flags &= ~BKPOINT_REINST;
@@ -379 +380 @@
 
                 /* Return first instruction back */
-                ((uint32_t *)cur->address)[0] = cur->instruction;
-                smc_coherence(cur->address, 4);
+                write_inst(cur->address, cur->instruction);
 
                 if (!(cur->flags & BKPOINT_ONESHOT)) {
                         /* Set Breakpoint on next instruction */
-                        ((uint32_t *)cur->address)[1] = 0x0d;
+                        write_inst(cur->address + 4, 0x0d);
                         cur->flags |= BKPOINT_REINST;
                 }