Changeset 1b43a04 in mainline

Timestamp:

2006-11-05T13:49:23Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b63a7cc

Parents:

14de0dd8

Message:

Modify selected function to consume less stack space.

Avoid flushw instruction in the sparc64 loader.

Files:

• boot/arch/sparc64/loader/boot.S (modified) (2 diffs)
• boot/arch/sparc64/loader/main.c (modified) (1 diff)
• kernel/genarch/src/ofw/ofw_tree.c (modified) (3 diffs)
• kernel/generic/src/console/kconsole.c (modified) (3 diffs)

boot/arch/sparc64/loader/boot.S

@@ -31 +31 @@
 #include <register.h>
 
-#define INITIAL_STACK_SIZE      1024
+#define INITIAL_STACK_SIZE      8192
+
+#define NWINDOWS                8
 
 .register %g2, #scratch
@@ -55 +57 @@
 .align 8
 1:      
-        flushw
-
         /*
          * Disable interrupts and disable address masking.
          */
         wrpr %g0, PSTATE_PRIV_BIT, %pstate
+        
+        wrpr %g0, NWINDOWS - 2, %cansave        ! set maximum saveable windows
+        wrpr %g0, 0, %canrestore                ! get rid of windows we will never need again
+        wrpr %g0, 0, %otherwin                  ! make sure the window state is consistent
+        wrpr %g0, NWINDOWS - 1, %cleanwin       ! prevent needless clean_window traps for kernel
 
         set initial_stack_top, %sp

boot/arch/sparc64/loader/main.c

@@ -38 +38 @@
 
 bootinfo_t bootinfo;
+component_t components[COMPONENTS];
 
 void bootstrap(void)
 {
         printf("HelenOS SPARC64 Bootloader\n");
-
-        component_t components[COMPONENTS];
+        
         init_components(components);
 

kernel/genarch/src/ofw/ofw_tree.c

@@ -38 +38 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <arch/memstr.h>
+#include <mm/slab.h>
 #include <func.h>
 #include <print.h>
@@ -237 +238 @@
 static void ofw_tree_node_print(const ofw_tree_node_t *node, const char *path)
 {
-        char p[PATH_MAX_LEN];
-        
+        char *p;
+
+        p = (char *) malloc(PATH_MAX_LEN, 0);
+
         if (node->parent) {
                 snprintf(p, PATH_MAX_LEN, "%s/%s", path, node->da_name);
@@ -249 +252 @@
         if (node->child)
                 ofw_tree_node_print(node->child, p);
-        
+
         if (node->peer)
                 ofw_tree_node_print(node->peer, path);
+
+        free(p);
 }
 

kernel/generic/src/console/kconsole.c

@@ -205 +205 @@
 static int cmdtab_compl(char *name)
 {
-        char output[MAX_SYMBOL_NAME+1];
+        static char output[MAX_SYMBOL_NAME+1];
         link_t *startpos = NULL;
         const char *foundtxt;
@@ -245 +245 @@
         static int histposition = 0;
 
-        char tmp[MAX_CMDLINE+1];
+        static char tmp[MAX_CMDLINE+1];
         int curlen = 0, position = 0;
         char *current = history[histposition];
@@ -434 +434 @@
 static int parse_int_arg(char *text, size_t len, unative_t *result)
 {
-        char symname[MAX_SYMBOL_NAME];
+        static char symname[MAX_SYMBOL_NAME];
         uintptr_t symaddr;
         bool isaddr = false;