Changeset d18ad61 in mainline

Timestamp:

2013-12-28T21:15:59Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ceb5757

Parents:

41b735f3

Message:

fix small omissions and API incompatibilities

Location:

kernel/arch/sparc32

Files:

• Makefile.inc (modified) (1 diff)
• include/arch/mm/page.h (modified) (2 diffs)
• src/debug/stacktrace.c (modified) (1 diff)
• src/mm/as.c (modified) (1 diff)
• src/sparc32.c (modified) (1 diff)

kernel/arch/sparc32/Makefile.inc

@@ -37 +37 @@
         arch/$(KARCH)/src/context.S \
         arch/$(KARCH)/src/debug/stacktrace.c \
-        arch/$(KARCH)/src/debug/stacktrace_asm.S \
         arch/$(KARCH)/src/proc/scheduler.c \
         arch/$(KARCH)/src/proc/task.c \

kernel/arch/sparc32/include/arch/mm/page.h

@@ -45 +45 @@
 #define PAGE_SIZE   FRAME_SIZE
 
+#define FRAME_LOWPRIO  0
+
 #define KA2PA(x)  (((uintptr_t) (x)) - UINT32_C(0x40000000))
 #define PA2KA(x)  (((uintptr_t) (x)) + UINT32_C(0x40000000))
@@ -68 +70 @@
 
 /* Page table sizes for each level. */
-#define PTL0_SIZE_ARCH  ONE_FRAME
-#define PTL1_SIZE_ARCH  0
-#define PTL2_SIZE_ARCH  ONE_FRAME
-#define PTL3_SIZE_ARCH  ONE_FRAME
+#define PTL0_FRAMES_ARCH  1
+#define PTL1_FRAMES_ARCH  0
+#define PTL2_FRAMES_ARCH  1
+#define PTL3_FRAMES_ARCH  1
 
 /* Macros calculating indices for each level. */

kernel/arch/sparc32/src/debug/stacktrace.c

@@ -51 +51 @@
 {
         uintptr_t kstack;
-        uint32_t l1
+        uint32_t l1;
         uint32_t l2;
         

kernel/arch/sparc32/src/mm/as.c

@@ -38 +38 @@
 #include <genarch/mm/page_pt.h>
 
+uintptr_t as_context_table;
+
 static ptd_t context_table[ASID_MAX_ARCH] __attribute__((aligned(1024)));
 

kernel/arch/sparc32/src/sparc32.c

@@ -53 +53 @@
 #include <str.h>
 
-static char memcpy_from_uspace_failover_address;
-static char memcpy_to_uspace_failover_address;
+char memcpy_from_uspace_failover_address;
+char memcpy_to_uspace_failover_address;
 static bootinfo_t machine_bootinfo;