Move popcli, pushcli, and getcallerpcs to trap.c

96068001 · Silas Boyd-Wickizer · 09e5ba89 · 96068001 · 96068001 · 96068001
--- a/kernel.h
+++ b/kernel.h
@@ -267,12 +267,9 @@ void            sampconf(void);
 // spinlock.c
 void            acquire(struct spinlock*);
 int             tryacquire(struct spinlock*);
-void            getcallerpcs(void*, uptr*);
 int             holding(struct spinlock*);
 void            initlock(struct spinlock*, const char*);
 void            release(struct spinlock*);
-void            pushcli(void);
-void            popcli(void);

 // syscall.c
 int             argint64(int, u64*);
@@ -300,6 +297,9 @@ void            swtch(struct context**, struct context*);

 // trap.c
 extern struct segdesc bootgdt[NSEGS];
+void            pushcli(void);
+void            popcli(void);
+void            getcallerpcs(void*, uptr*);

 // uart.c
 void            uartputc(char c);

--- a/spinlock.c
+++ b/spinlock.c
@@ -108,24 +108,6 @@ release(struct spinlock *lk)
  popcli();
 }

-// Record the current call stack in pcs[] by following the %ebp chain.
-void
-getcallerpcs(void *v, uptr pcs[])
-{
-  uptr *rbp;
-  int i;
-
-  rbp = (uptr*)v;
-  for(i = 0; i < 10; i++){
-    if(rbp == 0 || rbp < (uptr*)KBASE || rbp == (uptr*)(~0UL))
-      break;
-    pcs[i] = rbp[1];     // saved %rip
-    rbp = (uptr*)rbp[0]; // saved %rbp
-  }
-  for(; i < 10; i++)
-    pcs[i] = 0;
-}
-
 // Check whether this cpu is holding the lock.
 #if SPINLOCK_DEBUG
 int
@@ -134,30 +116,3 @@ holding(struct spinlock *lock)
    return lock->locked && lock->cpu == mycpu();
 }
 #endif
-
-
-// Pushcli/popcli are like cli/sti except that they are matched:
-// it takes two popcli to undo two pushcli.  Also, if interrupts
-// are off, then pushcli, popcli leaves them off.
-
-void
-pushcli(void)
-{
-  u64 rflags;
-
-  rflags = readrflags();
-  cli();
-  if(mycpu()->ncli++ == 0)
-    mycpu()->intena = rflags & FL_IF;
-}
-
-void
-popcli(void)
-{
-  if(readrflags()&FL_IF)
-    panic("popcli - interruptible");
-  if(--mycpu()->ncli < 0)
-    panic("popcli");
-  if(mycpu()->ncli == 0 && mycpu()->intena)
-    sti();
-}
--- a/trap.c
+++ b/trap.c
@@ -206,3 +206,46 @@ initseg(void)
  writemsr(MSR_SFMASK, FL_TF);
 #endif
 }
+
+// Pushcli/popcli are like cli/sti except that they are matched:
+// it takes two popcli to undo two pushcli.  Also, if interrupts
+// are off, then pushcli, popcli leaves them off.
+void
+pushcli(void)
+{
+  u64 rflags;
+
+  rflags = readrflags();
+  cli();
+  if(mycpu()->ncli++ == 0)
+    mycpu()->intena = rflags & FL_IF;
+}
+
+void
+popcli(void)
+{
+  if(readrflags()&FL_IF)
+    panic("popcli - interruptible");
+  if(--mycpu()->ncli < 0)
+    panic("popcli");
+  if(mycpu()->ncli == 0 && mycpu()->intena)
+    sti();
+}
+
+// Record the current call stack in pcs[] by following the %rbp chain.
+void
+getcallerpcs(void *v, uptr pcs[])
+{
+  uptr *rbp;
+  int i;
+
+  rbp = (uptr*)v;
+  for(i = 0; i < 10; i++){
+    if(rbp == 0 || rbp < (uptr*)KBASE || rbp == (uptr*)(~0UL))
+      break;
+    pcs[i] = rbp[1];     // saved %rip
+    rbp = (uptr*)rbp[0]; // saved %rbp
+  }
+  for(; i < 10; i++)
+    pcs[i] = 0;
+}