Changeset 3550c393 in mainline

Timestamp:

2005-12-11T21:36:42Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

ba276f7

Parents:

0c8e692

Message:

Symtab returns correct addresses even when symtab is befor bss.
Some tab completion optimization.

Files:

• Makefile (modified) (1 diff)
• arch/amd64/_link.ld.in (modified) (1 diff)
• arch/ia32/_link.ld.in (modified) (1 diff)
• generic/src/console/cmd.c (modified) (4 diffs)
• generic/src/console/kconsole.c (modified) (3 diffs)
• generic/src/debug/symtab.c (modified) (1 diff)

Makefile

@@ -189 +189 @@
         $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
         tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin 
+        # Do it once again, this time to get correct even the symbols
+        # on architectures, that have bss after symtab
+        $(OBJCOPY) -I binary -O $(BFD_NAME) -B $(BFD_ARCH) --prefix-sections=symtab generic/src/debug/real_map.bin generic/src/debug/sizeok_map.o
+        $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) generic/src/debug/sizeok_map.o -o $@ -Map kernel.map.pre
+        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
+        tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin 
+        
 
 generic/src/debug/real_map.o: generic/src/debug/real_map.bin

arch/amd64/_link.ld.in

@@ -49 +49 @@
 
                 *(.eh_frame);
-                *(.bss);                /* uninitialized static variables */
 
                 symbol_table = .;
                 *(symtab.*);            /* Symbol table, must be LAST symbol!*/
+
+                *(.bss);                /* uninitialized static variables */
 
                 kdata_end = .;

arch/ia32/_link.ld.in

@@ -47 +47 @@
                 hardcoded_unmapped_kdata_size = .;
                 LONG(unmapped_kdata_end - unmapped_kdata_start);
-                *(.bss);                        /* uninitialized static variables */
                 symbol_table = .;
                 *(symtab.*);                    /* Symbol table, must be LAST symbol! */
-
+                *(.bss);                        /* uninitialized static variables */
                 kdata_end = .;
         }

generic/src/console/cmd.c

@@ -359 +359 @@
                 printf("Calling f(): 0x%p: %s\n", symaddr, symbol);
                 f =  (__native (*)(void)) symaddr;
-                printf("Result: 0x%X\n", f());
+                printf("Result: 0x%p\n", f());
         }
         
@@ -383 +383 @@
                 printf("Calling f(0x%x): 0x%p: %s\n", arg1, symaddr, symbol);
                 f =  (__native (*)(__native)) symaddr;
-                printf("Result: 0x%x\n", f(arg1));
+                printf("Result: 0x%p\n", f(arg1));
         }
         
@@ -409 +409 @@
                        arg1, arg2, symaddr, symbol);
                 f =  (__native (*)(__native,__native)) symaddr;
-                printf("Result: 0x%x\n", f(arg1, arg2));
+                printf("Result: 0x%p\n", f(arg1, arg2));
         }
         
@@ -436 +436 @@
                        arg1, arg2, arg3, symaddr, symbol);
                 f =  (__native (*)(__native,__native,__native)) symaddr;
-                printf("Result: 0x%x\n", f(arg1, arg2, arg3));
+                printf("Result: 0x%p\n", f(arg1, arg2, arg3));
         }
         

generic/src/console/kconsole.c

@@ -216 +216 @@
                 return 0;
 
-        if (found > 1) {
+        if (found > 1 && !strlen(output)) {
                 printf("\n");
                 startpos = NULL;
@@ -287 +287 @@
                         for (i=0;tmp[i] && curlen < MAX_CMDLINE;i++,curlen++)
                                 insert_char(current, tmp[i], i+position);
-                        if (found == 1) { /* One match */
-                                for (i=position;i<curlen;i++)
+
+                        if (strlen(tmp) || found==1) { /* If we have a hint */
+                                for (i=position;i<curlen;i++) 
                                         putchar(current[i]);
                                 position += strlen(tmp);
                                 /* Add space to end */
-                                if (position == curlen && curlen < MAX_CMDLINE) {
+                                if (found == 1 && position == curlen && \
+                                    curlen < MAX_CMDLINE) {
                                         current[position] = ' ';
                                         curlen++;
@@ -298 +300 @@
                                         putchar(' ');
                                 }
-                        } else {
+                        } else { /* No hint, table was printed */
                                 printf("%s> ", prompt);
                                 for (i=0; i<curlen;i++)

generic/src/debug/symtab.c

@@ -173 +173 @@
                 return 0;
 
-        if (found > 1) {
+        if (found > 1 && !strlen(output)) {
                 printf("\n");
                 startpos = 0;