coreboot September 2011

coreboot@coreboot.org

40 participants
224 discussions

Patch set updated: 20de823 Add support utils for tracing
by Rudolf Marek 03 Sep '11

03 Sep '11

Rudolf Marek (r.marek(a)assembler.cz) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/179 -gerrit commit 20de8236d60d90397ebfa151e194cc851c28a227 Author: Rudolf Marek <r.marek(a)assembler.cz> Date: Fri Sep 2 23:34:15 2011 +0200 Add support utils for tracing Following patch adds a userspace util genprof which is able to convert the console printed traces to gmon.out file used by gprof & friends. The log2dress will replace the adresses in logfile with a line numbers. Change-Id: I9f716f3ff2522a24fbc844a1dd5e32ef49b540c5 Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> --- util/genprof/Makefile | 12 +++++ util/genprof/README | 31 ++++++++++++++ util/genprof/genprof.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ util/genprof/log2dress | 20 +++++++++ 4 files changed, 171 insertions(+), 0 deletions(-) diff --git a/util/genprof/Makefile b/util/genprof/Makefile new file mode 100644 index 0000000..2ec77c9 --- /dev/null +++ b/util/genprof/Makefile @@ -0,0 +1,12 @@ +CC=gcc +CFLAGS=-O2 -Wall + +all: genprof + +genprof: genprof.o + $(CC) $(CFLAGS) -o genprof $^ + +clean: + rm -f genprof *.o *~ + +distclean: clean diff --git a/util/genprof/README b/util/genprof/README new file mode 100644 index 0000000..3483a2b --- /dev/null +++ b/util/genprof/README @@ -0,0 +1,31 @@ +Function tracing +---------------- + +Enable CONFIG_TRACE in debug menu. Run the compiled image on target. You will get +a log with a lot of lines like: + +... +~0x001072e8(0x00100099) +~0x00108bc0(0x0010730a) +... + +First address is address of function which was just entered, the second address +is address of functions which call that. + +You can use the log2dress to dress the log again: + +... +src/arch/x86/lib/c_start.S:85 calls /home/ruik/coreboot/src/boot/selfboot.c:367 +/home/ruik/coreboot/src/boot/selfboot.c:370 calls /home/ruik/coreboot/src/devices/device.c:325 +... + +Alternatively, you can use genprof to generate a gmon.out file, which can be used +by gprof to show the call traces. You will need to install uthash library to compile +that. + +Great use is: + +make +./genprof /tmp/yourlog ; gprof ../../build/coreboot_ram | ./gprof2dot.py -e0 -n0 | dot -Tpng -o output.png + +Which generates a PNG with a call graph. diff --git a/util/genprof/genprof.c b/util/genprof/genprof.c new file mode 100644 index 0000000..9fc39da --- /dev/null +++ b/util/genprof/genprof.c @@ -0,0 +1,108 @@ +#include <stdio.h> +#include <uthash.h> +#include <sys/gmon_out.h> +#include <stdlib.h> + +#define GMON_SEC "seconds s" +uint32_t mineip = 0xffffffff; +uint32_t maxeip = 0; + +/* a hash structure to hold the arc */ +struct arec { + uint32_t eip; + uint32_t from; + uint32_t count; + UT_hash_handle hh; +}; + +struct arec *arc = NULL; + +void note_arc(uint32_t eip, uint32_t from) +{ + struct arec *s; + + HASH_FIND_INT(arc, &eip, s); + if (s == NULL) { + s = malloc(sizeof(struct arec)); + s->eip = eip; + s->from = from; + s->count = 1; + if (eip > maxeip) + maxeip = eip; + if (eip < mineip) + maxeip = eip; + + HASH_ADD_INT(arc, eip, s); + } else { + s->count++; + } +} + +int main(int argc, char* argv[]) +{ + FILE *f, *fo; + struct arec *s; + uint32_t eip, from, tmp; + uint8_t tag; + uint16_t hit; + + if ( argc < 2 ) + { + fprintf(stderr, "Please specify the coreboot trace log as parameter\n"); + return 1; + } + + f = fopen(argv[1], "r"); + fo = fopen("gmon.out", "w+"); + + if ((f == NULL) || (fo == NULL)) { + fprintf(stderr, "Unable to manipulate with the input file\n"); + return 1; + } + + while (!feof(f)) { + if (fscanf(f, "~%x(%x)%*[^\n]\n", &eip, &from) == 2) { + note_arc(eip, from); + } else if (fscanf(f, "%*c~%x(%x)%*[^\n]\n", &eip, &from) == 2) { + note_arc(eip, from); + } else { + /* just drop a line */ + tmp = fscanf(f, "%*[^\n]\n"); + } + } + + /* write gprof header */ + fwrite(GMON_MAGIC, 1, sizeof(GMON_MAGIC) - 1, fo); + tmp = GMON_VERSION; + fwrite(&tmp, 1, sizeof(tmp), fo); + tmp = 0; + fwrite(&tmp, 1, sizeof(tmp), fo); + fwrite(&tmp, 1, sizeof(tmp), fo); + fwrite(&tmp, 1, sizeof(tmp), fo); + /* write fake histogram */ + tag = GMON_TAG_TIME_HIST; + fwrite(&tag, 1, sizeof(tag), fo); + fwrite(&mineip, 1, sizeof(mineip), fo); + fwrite(&maxeip, 1, sizeof(maxeip), fo); + /* size of histogram */ + tmp = 1; + fwrite(&tmp, 1, sizeof(tmp), fo); + /* prof rate */ + tmp = 1000; + fwrite(&tmp, 1, sizeof(tmp), fo); + fwrite(GMON_SEC, 1, sizeof(GMON_SEC) - 1, fo); + hit = 1; + fwrite(&hit, 1, sizeof(hit), fo); + + /* write call graph data */ + tag = GMON_TAG_CG_ARC; + for (s = arc; s != NULL; s = s->hh.next) { + fwrite(&tag, 1, sizeof(tag), fo); + fwrite(&s->from, 1, sizeof(s->from), fo); + fwrite(&s->eip, 1, sizeof(s->eip), fo); + fwrite(&s->count, 1, sizeof(s->count), fo); + } + + fclose(fo); + return 0; +} diff --git a/util/genprof/log2dress b/util/genprof/log2dress new file mode 100755 index 0000000..429f846 --- /dev/null +++ b/util/genprof/log2dress @@ -0,0 +1,20 @@ +#!/bin/bash +#Parse a log and get back the function names and line numbers +#Provide a log file as first argument + +#Please rewrite to something more saner ! + +cat $1 | while read line ; do +A=`echo $line | cut -c 1` + +if [ "$A" = '~' ] ; then +FROM=`echo $line | tr \~ $ | tr $ $ | awk -F\( '{print $3}'` +TO=`echo $line | tr \~ \( | tr $ \(|awk -F\( '{print $2}'` +addr2line -e ../../build/coreboot_ram.debug "$FROM" | tr -d "\n" +echo -n " calls " +addr2line -e ../../build/coreboot_ram.debug "$TO" +else +echo "$line" +fi + +done

1 0

Patch set updated: b3e5d4e Add support for the tracing infastructure in coreboot.
by Rudolf Marek 03 Sep '11

03 Sep '11

Rudolf Marek (r.marek(a)assembler.cz) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/178 -gerrit commit b3e5d4e8902992e63e83f963b7acd1a56f6217f8 Author: Rudolf Marek <r.marek(a)assembler.cz> Date: Fri Sep 2 23:23:41 2011 +0200 Add support for the tracing infastructure in coreboot. The compiler is forced to emmit special functions on every entry/exit of the function. Add a compile time option to support it. Function entries will be printed in the console. The CONFIG_TRACE has more documentation. Patch for userspace tools will follow. Change-Id: I2cbeb3f104892b034c8756f86ed05bf71187c3f3 Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> --- Makefile.inc | 4 +++ src/Kconfig | 9 ++++++++ src/console/printk.c | 3 ++ src/console/vsprintf.c | 3 ++ src/include/trace.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/Makefile.inc | 1 + src/lib/trace.c | 39 +++++++++++++++++++++++++++++++++++ src/lib/uart8250.c | 4 +++ 8 files changed, 116 insertions(+), 0 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 37e4fb6..167ab5b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -51,6 +51,10 @@ classes-y := ramstage romstage driver smm romstage-c-ccopts:=-D__PRE_RAM__ romstage-S-ccopts:=-D__PRE_RAM__ +ifeq ($(CONFIG_TRACE),y) +ramstage-c-ccopts:= -finstrument-functions +endif + smm-c-ccopts:=-D__SMM__ smm-S-ccopts:=-D__SMM__ diff --git a/src/Kconfig b/src/Kconfig index f96c903..e9ceed5 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -845,6 +845,15 @@ config LLSHELL Put llshell() in your (romstage) code to start the shell. See src/arch/x86/llshell/llshell.inc for details. +config TRACE + bool "Trace function calls" + default n + help + If enabled, every function will print information to console once + the function is entered. The syntax is ~0xaaaabbbb(0xccccdddd) + the 0xaaaabbbb is the actual function and 0xccccdddd is EIP + of calling function. Please note some printk releated functions + are omitted from trace to have good looking console dumps. endmenu config LIFT_BSP_APIC_ID diff --git a/src/console/printk.c b/src/console/printk.c index 488d4e5..7549088 100644 --- a/src/console/printk.c +++ b/src/console/printk.c @@ -8,6 +8,7 @@ #include <smp/spinlock.h> #include <console/vtxprintf.h> #include <console/console.h> +#include <trace.h> int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; int default_console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; @@ -23,6 +24,7 @@ int do_printk(int msg_level, const char *fmt, ...) return 0; } + DISABLE_TRACE; spin_lock(&console_lock); va_start(args, fmt); @@ -32,6 +34,7 @@ int do_printk(int msg_level, const char *fmt, ...) console_tx_flush(); spin_unlock(&console_lock); + ENABLE_TRACE; return i; } diff --git a/src/console/vsprintf.c b/src/console/vsprintf.c index 4a74523..435401b 100644 --- a/src/console/vsprintf.c +++ b/src/console/vsprintf.c @@ -22,6 +22,7 @@ #include <string.h> #include <smp/spinlock.h> #include <console/vtxprintf.h> +#include <trace.h> DECLARE_SPIN_LOCK(vsprintf_lock) @@ -37,6 +38,7 @@ static int vsprintf(char *buf, const char *fmt, va_list args) { int i; + DISABLE_TRACE; spin_lock(&vsprintf_lock); str_buf = buf; @@ -44,6 +46,7 @@ static int vsprintf(char *buf, const char *fmt, va_list args) *str_buf = '\0'; spin_unlock(&vsprintf_lock); + ENABLE_TRACE; return i; } diff --git a/src/include/trace.h b/src/include/trace.h new file mode 100644 index 0000000..9f90766 --- /dev/null +++ b/src/include/trace.h @@ -0,0 +1,53 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Rudolf Marek <r.marek(a)assembler.cz> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __TRACE_H +#define __TRACE_H + +void __cyg_profile_func_enter( void *, void * ) + __attribute__ ((no_instrument_function)); + +void __cyg_profile_func_exit( void *, void * ) + __attribute__ ((no_instrument_function)); + +extern volatile int trace_dis; + +#ifdef __PRE_RAM__ + +#define DISABLE_TRACE +#define ENABLE_TRACE +#define DISABLE_TRACE_ON_FUNCTION + +#else /* !__PRE_RAM__ */ + +#if CONFIG_TRACE + +#define DISABLE_TRACE do { trace_dis = 1; } while (0); +#define ENABLE_TRACE do { trace_dis = 0; } while (0); +#define DISABLE_TRACE_ON_FUNCTION __attribute__ ((no_instrument_function)); + +#else /* !CONFIG_TRACE */ + +#define DISABLE_TRACE +#define ENABLE_TRACE +#define DISABLE_TRACE_ON_FUNCTION + +#endif +#endif +#endif diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 54935ca..b207ffe 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -33,6 +33,7 @@ ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem.c ramstage-$(CONFIG_USBDEBUG) += usbdebug.c ramstage-$(CONFIG_BOOTSPLASH) += jpeg.c +ramstage-$(CONFIG_TRACE) += trace.c driver-$(CONFIG_CONSOLE_NE2K) += ne2k.c diff --git a/src/lib/trace.c b/src/lib/trace.c new file mode 100644 index 0000000..8736c82 --- /dev/null +++ b/src/lib/trace.c @@ -0,0 +1,39 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Rudolf Marek <r.marek(a)assembler.cz> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <types.h> +#include <console/console.h> +#include <trace.h> + +int volatile trace_dis = 0; + +void __cyg_profile_func_enter( void *func, void *callsite) +{ + + if (trace_dis) + return; + + DISABLE_TRACE + printk(BIOS_INFO, "~0x%08x(0x%08x)\n", (uint32_t) func, (uint32_t) callsite); + ENABLE_TRACE +} + +void __cyg_profile_func_exit( void *func, void *callsite ) +{ +} diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c index e7ddd0b..b224671 100644 --- a/src/lib/uart8250.c +++ b/src/lib/uart8250.c @@ -21,6 +21,8 @@ #include <arch/io.h> #include <uart8250.h> #include <pc80/mc146818rtc.h> +#include <trace.h> + #if CONFIG_USE_OPTION_TABLE #include "option_table.h" #endif @@ -69,6 +71,7 @@ unsigned char uart8250_rx_byte(unsigned base_port) void uart8250_init(unsigned base_port, unsigned divisor) { + DISABLE_TRACE; /* Disable interrupts */ outb(0x0, base_port + UART_IER); /* Enable FIFOs */ @@ -86,6 +89,7 @@ void uart8250_init(unsigned base_port, unsigned divisor) /* Set to 3 for 8N1 */ outb(CONFIG_TTYS0_LCS, base_port + UART_LCR); + ENABLE_TRACE; } void uart_init(void)

1 0

New patch to review: 153ff73 Add support utils for tracing
by Rudolf Marek 03 Sep '11

03 Sep '11

Rudolf Marek (r.marek(a)assembler.cz) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/179 -gerrit commit 153ff739cd7ae573610c2deba8700b628468a839 Author: Rudolf Marek <r.marek(a)assembler.cz> Date: Fri Sep 2 23:34:15 2011 +0200 Add support utils for tracing Following patch adds a userspace util genprof which is able to convert the console printed traces to gmon.out file used by gprof & friends. The log2dress will replace the adresses in logfile with a line numbers. Change-Id: I9f716f3ff2522a24fbc844a1dd5e32ef49b540c5 Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> --- util/genprof/Makefile | 12 +++++ util/genprof/README | 31 ++++++++++++++ util/genprof/genprof.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++ util/genprof/log2dress | 20 +++++++++ 4 files changed, 171 insertions(+), 0 deletions(-) diff --git a/util/genprof/Makefile b/util/genprof/Makefile new file mode 100644 index 0000000..2ec77c9 --- /dev/null +++ b/util/genprof/Makefile @@ -0,0 +1,12 @@ +CC=gcc +CFLAGS=-O2 -Wall + +all: genprof + +genprof: genprof.o + $(CC) $(CFLAGS) -o genprof $^ + +clean: + rm -f genprof *.o *~ + +distclean: clean diff --git a/util/genprof/README b/util/genprof/README new file mode 100644 index 0000000..3483a2b --- /dev/null +++ b/util/genprof/README @@ -0,0 +1,31 @@ +Function tracing +---------------- + +Enable CONFIG_TRACE in debug menu. Run the compiled image on target. You will get +a log with a lot of lines like: + +... +~0x001072e8(0x00100099) +~0x00108bc0(0x0010730a) +... + +First address is address of function which was just entered, the second address +is address of functions which call that. + +You can use the log2dress to dress the log again: + +... +src/arch/x86/lib/c_start.S:85 calls /home/ruik/coreboot/src/boot/selfboot.c:367 +/home/ruik/coreboot/src/boot/selfboot.c:370 calls /home/ruik/coreboot/src/devices/device.c:325 +... + +Alternatively, you can use genprof to generate a gmon.out file, which can be used +by gprof to show the call traces. You will need to install uthash library to compile +that. + +Great use is: + +make +./genprof /tmp/yourlog ; gprof ../../build/coreboot_ram | ./gprof2dot.py -e0 -n0 | dot -Tpng -o output.png + +Which generates a PNG with a call graph. diff --git a/util/genprof/genprof.c b/util/genprof/genprof.c new file mode 100644 index 0000000..9fc39da --- /dev/null +++ b/util/genprof/genprof.c @@ -0,0 +1,108 @@ +#include <stdio.h> +#include <uthash.h> +#include <sys/gmon_out.h> +#include <stdlib.h> + +#define GMON_SEC "seconds s" +uint32_t mineip = 0xffffffff; +uint32_t maxeip = 0; + +/* a hash structure to hold the arc */ +struct arec { + uint32_t eip; + uint32_t from; + uint32_t count; + UT_hash_handle hh; +}; + +struct arec *arc = NULL; + +void note_arc(uint32_t eip, uint32_t from) +{ + struct arec *s; + + HASH_FIND_INT(arc, &eip, s); + if (s == NULL) { + s = malloc(sizeof(struct arec)); + s->eip = eip; + s->from = from; + s->count = 1; + if (eip > maxeip) + maxeip = eip; + if (eip < mineip) + maxeip = eip; + + HASH_ADD_INT(arc, eip, s); + } else { + s->count++; + } +} + +int main(int argc, char* argv[]) +{ + FILE *f, *fo; + struct arec *s; + uint32_t eip, from, tmp; + uint8_t tag; + uint16_t hit; + + if ( argc < 2 ) + { + fprintf(stderr, "Please specify the coreboot trace log as parameter\n"); + return 1; + } + + f = fopen(argv[1], "r"); + fo = fopen("gmon.out", "w+"); + + if ((f == NULL) || (fo == NULL)) { + fprintf(stderr, "Unable to manipulate with the input file\n"); + return 1; + } + + while (!feof(f)) { + if (fscanf(f, "~%x(%x)%*[^\n]\n", &eip, &from) == 2) { + note_arc(eip, from); + } else if (fscanf(f, "%*c~%x(%x)%*[^\n]\n", &eip, &from) == 2) { + note_arc(eip, from); + } else { + /* just drop a line */ + tmp = fscanf(f, "%*[^\n]\n"); + } + } + + /* write gprof header */ + fwrite(GMON_MAGIC, 1, sizeof(GMON_MAGIC) - 1, fo); + tmp = GMON_VERSION; + fwrite(&tmp, 1, sizeof(tmp), fo); + tmp = 0; + fwrite(&tmp, 1, sizeof(tmp), fo); + fwrite(&tmp, 1, sizeof(tmp), fo); + fwrite(&tmp, 1, sizeof(tmp), fo); + /* write fake histogram */ + tag = GMON_TAG_TIME_HIST; + fwrite(&tag, 1, sizeof(tag), fo); + fwrite(&mineip, 1, sizeof(mineip), fo); + fwrite(&maxeip, 1, sizeof(maxeip), fo); + /* size of histogram */ + tmp = 1; + fwrite(&tmp, 1, sizeof(tmp), fo); + /* prof rate */ + tmp = 1000; + fwrite(&tmp, 1, sizeof(tmp), fo); + fwrite(GMON_SEC, 1, sizeof(GMON_SEC) - 1, fo); + hit = 1; + fwrite(&hit, 1, sizeof(hit), fo); + + /* write call graph data */ + tag = GMON_TAG_CG_ARC; + for (s = arc; s != NULL; s = s->hh.next) { + fwrite(&tag, 1, sizeof(tag), fo); + fwrite(&s->from, 1, sizeof(s->from), fo); + fwrite(&s->eip, 1, sizeof(s->eip), fo); + fwrite(&s->count, 1, sizeof(s->count), fo); + } + + fclose(fo); + return 0; +} diff --git a/util/genprof/log2dress b/util/genprof/log2dress new file mode 100755 index 0000000..429f846 --- /dev/null +++ b/util/genprof/log2dress @@ -0,0 +1,20 @@ +#!/bin/bash +#Parse a log and get back the function names and line numbers +#Provide a log file as first argument + +#Please rewrite to something more saner ! + +cat $1 | while read line ; do +A=`echo $line | cut -c 1` + +if [ "$A" = '~' ] ; then +FROM=`echo $line | tr \~ $ | tr $ $ | awk -F\( '{print $3}'` +TO=`echo $line | tr \~ \( | tr $ \(|awk -F\( '{print $2}'` +addr2line -e ../../build/coreboot_ram.debug "$FROM" | tr -d "\n" +echo -n " calls " +addr2line -e ../../build/coreboot_ram.debug "$TO" +else +echo "$line" +fi + +done

1 0

New patch to review: 11c5f02 Add support for the tracing infastructure in coreboot.
by Rudolf Marek 03 Sep '11

03 Sep '11

Rudolf Marek (r.marek(a)assembler.cz) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/178 -gerrit commit 11c5f026823afc880cb490e87be28ae842154e28 Author: Rudolf Marek <r.marek(a)assembler.cz> Date: Fri Sep 2 23:23:41 2011 +0200 Add support for the tracing infastructure in coreboot. The compiler is forced to emmit special functions on every entry/exit of the function. Add a compile time option to support it. Function entries will be printed in the console. The CONFIG_TRACE has more documentation. Patch for userspace tools will follow. Change-Id: I2cbeb3f104892b034c8756f86ed05bf71187c3f3 Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> --- Makefile.inc | 4 +++ src/Kconfig | 9 ++++++++ src/console/printk.c | 3 ++ src/console/vsprintf.c | 3 ++ src/include/trace.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/Makefile.inc | 1 + src/lib/trace.c | 39 +++++++++++++++++++++++++++++++++++ src/lib/uart8250.c | 4 +++ 8 files changed, 116 insertions(+), 0 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 37e4fb6..167ab5b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -51,6 +51,10 @@ classes-y := ramstage romstage driver smm romstage-c-ccopts:=-D__PRE_RAM__ romstage-S-ccopts:=-D__PRE_RAM__ +ifeq ($(CONFIG_TRACE),y) +ramstage-c-ccopts:= -finstrument-functions +endif + smm-c-ccopts:=-D__SMM__ smm-S-ccopts:=-D__SMM__ diff --git a/src/Kconfig b/src/Kconfig index f96c903..e9ceed5 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -845,6 +845,15 @@ config LLSHELL Put llshell() in your (romstage) code to start the shell. See src/arch/x86/llshell/llshell.inc for details. +config TRACE + bool "Trace function calls" + default n + help + If enabled, every function will print information to console once + the function is entered. The syntax is ~0xaaaabbbb(0xccccdddd) + the 0xaaaabbbb is the actual function and 0xccccdddd is EIP + of calling function. Please note some printk releated functions + are omitted from trace to have good looking console dumps. endmenu config LIFT_BSP_APIC_ID diff --git a/src/console/printk.c b/src/console/printk.c index 488d4e5..7549088 100644 --- a/src/console/printk.c +++ b/src/console/printk.c @@ -8,6 +8,7 @@ #include <smp/spinlock.h> #include <console/vtxprintf.h> #include <console/console.h> +#include <trace.h> int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; int default_console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; @@ -23,6 +24,7 @@ int do_printk(int msg_level, const char *fmt, ...) return 0; } + DISABLE_TRACE; spin_lock(&console_lock); va_start(args, fmt); @@ -32,6 +34,7 @@ int do_printk(int msg_level, const char *fmt, ...) console_tx_flush(); spin_unlock(&console_lock); + ENABLE_TRACE; return i; } diff --git a/src/console/vsprintf.c b/src/console/vsprintf.c index 4a74523..435401b 100644 --- a/src/console/vsprintf.c +++ b/src/console/vsprintf.c @@ -22,6 +22,7 @@ #include <string.h> #include <smp/spinlock.h> #include <console/vtxprintf.h> +#include <trace.h> DECLARE_SPIN_LOCK(vsprintf_lock) @@ -37,6 +38,7 @@ static int vsprintf(char *buf, const char *fmt, va_list args) { int i; + DISABLE_TRACE; spin_lock(&vsprintf_lock); str_buf = buf; @@ -44,6 +46,7 @@ static int vsprintf(char *buf, const char *fmt, va_list args) *str_buf = '\0'; spin_unlock(&vsprintf_lock); + ENABLE_TRACE; return i; } diff --git a/src/include/trace.h b/src/include/trace.h new file mode 100644 index 0000000..9f90766 --- /dev/null +++ b/src/include/trace.h @@ -0,0 +1,53 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Rudolf Marek <r.marek(a)assembler.cz> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __TRACE_H +#define __TRACE_H + +void __cyg_profile_func_enter( void *, void * ) + __attribute__ ((no_instrument_function)); + +void __cyg_profile_func_exit( void *, void * ) + __attribute__ ((no_instrument_function)); + +extern volatile int trace_dis; + +#ifdef __PRE_RAM__ + +#define DISABLE_TRACE +#define ENABLE_TRACE +#define DISABLE_TRACE_ON_FUNCTION + +#else /* !__PRE_RAM__ */ + +#if CONFIG_TRACE + +#define DISABLE_TRACE do { trace_dis = 1; } while (0); +#define ENABLE_TRACE do { trace_dis = 0; } while (0); +#define DISABLE_TRACE_ON_FUNCTION __attribute__ ((no_instrument_function)); + +#else /* !CONFIG_TRACE */ + +#define DISABLE_TRACE +#define ENABLE_TRACE +#define DISABLE_TRACE_ON_FUNCTION + +#endif +#endif +#endif diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 54935ca..3d8e889 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -14,6 +14,7 @@ romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c romstage-$(CONFIG_CONSOLE_NE2K) += compute_ip_checksum.c romstage-$(CONFIG_USBDEBUG) += usbdebug.c +ramstage-y += trace.c ramstage-y += memset.c ramstage-y += memcpy.c ramstage-y += memcmp.c diff --git a/src/lib/trace.c b/src/lib/trace.c new file mode 100644 index 0000000..8736c82 --- /dev/null +++ b/src/lib/trace.c @@ -0,0 +1,39 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Rudolf Marek <r.marek(a)assembler.cz> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <types.h> +#include <console/console.h> +#include <trace.h> + +int volatile trace_dis = 0; + +void __cyg_profile_func_enter( void *func, void *callsite) +{ + + if (trace_dis) + return; + + DISABLE_TRACE + printk(BIOS_INFO, "~0x%08x(0x%08x)\n", (uint32_t) func, (uint32_t) callsite); + ENABLE_TRACE +} + +void __cyg_profile_func_exit( void *func, void *callsite ) +{ +} diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c index e7ddd0b..b224671 100644 --- a/src/lib/uart8250.c +++ b/src/lib/uart8250.c @@ -21,6 +21,8 @@ #include <arch/io.h> #include <uart8250.h> #include <pc80/mc146818rtc.h> +#include <trace.h> + #if CONFIG_USE_OPTION_TABLE #include "option_table.h" #endif @@ -69,6 +71,7 @@ unsigned char uart8250_rx_byte(unsigned base_port) void uart8250_init(unsigned base_port, unsigned divisor) { + DISABLE_TRACE; /* Disable interrupts */ outb(0x0, base_port + UART_IER); /* Enable FIFOs */ @@ -86,6 +89,7 @@ void uart8250_init(unsigned base_port, unsigned divisor) /* Set to 3 for 8N1 */ outb(CONFIG_TTYS0_LCS, base_port + UART_LCR); + ENABLE_TRACE; } void uart_init(void)

1 0

[RFC] tracing execution flow
by Rudolf Marek 02 Sep '11

02 Sep '11

Hi, Sorry about the email quality I'm too tired to re-check it again. I had an idea to hijack the gprof for fun. I compiled the coreboot with -pg option (and enabled stack frames) resulting that each called function has a "mcount" funtion called in prolog for gprof. However we do not use libc and gprof but we can use this for: 1) to show where whole execution flow goes 2) real time tracing (if console is RAM) 3) stack size checking So far I have a proof of concept which is attached. It adds for ramstage -pg option and then implements the mcount function which looks into the frame pointer and prints to serial console who is it and who is the caller. This function then calls C function gprof which just print stack size and that information Also, I protect the recursive usage of mcount during the gprof call via in_pg. Which is also triggered to remove sprintf and printf bits from logs. It produces something like this: Stage: loading fallback/coreboot_ram @ 0x100000 (606208 bytes), entry @ 0x100000 Stage: done loading. Jumping to image. ~0x00107139(0x00100099)1638316 ~0x00108599(0x00107146)1638304 ~0x00107da5(0x0010714b)1638296 ~0x001070fe(0x00107dbe)1638288 ~0x00108599(0x00107157)1638304 ~0x00107d3c(0x00107186)1638264 coreboot-4.0-1681-gd6a736e-dirty Mon Aug 29 22:56:18 CEST 2011 booting... ~0x00108599(0x00107190)1638304 ~0x0011157d(0x001071a1)1638320 ~0x00109a7a(0x001071a6)1638304 ~0x00107d3c(0x00109a86)1638264 Enumerating buses... No timing info so far. I annotate this log with a help of gdb and script tp: Check fallback/romstage Check fallback/coreboot_ram Stage: loading fallback/coreboot_ram @ 0x100000 (606208 bytes), entry @ 0x100000 Stage: done loading. Jumping to image. ~0x00107139(0x00100099)1638316~0x107139 is in hardwaremain (src/boot /hardwaremain.c:57). FROM 0x100099 is at src/arch/x86/lib/c_start.S:85. ~0x00108599(0x00107146)1638304~0x108599 is in post_code (src/arch/x86/include/arch/io.h:46). FROM 0x107146 is in hardwaremain (src/boot/hardwaremain.c:63). ~0x00107da5(0x0010714b)1638296~0x107da5 is in console_init (src/console/console.c:42). FROM 0x10714b is in hardwaremain (src/boot/hardwaremain.c:65). ~0x001070fe(0x00107dbe)1638288~0x1070fe is in uart_init (src/arch/x86/include/arch/io.h:46). FROM 0x107dbe is in console_init (src/console/console.c:44). ~0x00108599(0x00107157)1638304~0x108599 is in post_code (src/arch/x86/include/arch/io.h:46). FROM 0x107157 is in hardwaremain (src/boot/hardwaremain.c:67). ~0x00107d3c(0x00107186)1638264~0x107d3c is in do_printk (src/console/printk.c:25). FROM 0x107186 is in hardwaremain (src/boot/hardwaremain.c:71). coreboot-4.0-1681-gd6a736e-dirty Mon Aug 29 22:56:18 CEST 2011 booting... Or some nice bits: Adding high table area ~0x0010dc84(0x0010e23d)463340~0x10dc84 is in lb_add_memory_range (src/arch/x86/boot/coreboot_table.c:417). FROM 0x10e23d is in write_coreboot_table (src/arch/x86/boot/coreboot_table.c:495). ~0x00113a60(0x0010dd65)463304~0x113a60 is in memmove (src/lib/memmove.c:3). FROM 0x10dd65 is in lb_add_memory_range (src/arch/x86/boot/coreboot_table.c:383). ~0x00113a60(0x0010dd65)463304~0x113a60 is in memmove (src/lib/memmove.c:3). FROM 0x10dd65 is in lb_add_memory_range (src/arch/x86/boot/coreboot_table.c:383). ~0x0010d96a(0x0010dea1)463296~0x10d96a is in lb_memory_range (src/arch/x86/boot/coreboot_table.c:252). FROM 0x10dea1 is in lb_add_memory_range (src/arch/x86/boot/coreboot_table.c:420). ~0x0010d9fa(0x0010e23d)463324~0x10d9fa is in lb_cleanup_memory_ranges (src/arch/x86/boot/coreboot_table.c:317). FROM 0x10e23d is in write_coreboot_table (src/arch/x86/boot/coreboot_table.c P#1 freq 1000 [MHz] voltage 1100 [mV] TDP 21000 [mW] ~0x00110384(0x00116dcd)463164~0x110384 is in acpigen_write_processor (src/arch/x86/boot/acpigen.c:259). FROM 0x116dcd is in amd_model_fxx_generate_powernow (src/cpu/amd/model_fxx/powernow_a cpi.c:44). ~0x0010fd74(0x001103ab)463148~0x10fd74 is in acpigen_write_len_f (src/arch/x86/boot/acpigen.c:40). FROM 0x1103ab is in acpigen_write_processor (src/arch/x86/boot/acpigen.c:271). ~0x0010853f(0x001103c4)463128~0x10853f is in sprintf (src/console/vsprintf.c:58). FROM 0x1103c4 is in acpigen_write_processor (src/arch/x86/boot/acpigen.c:272). ~0x0010fe6b(0x001103cc)463100~0x10fe6b is in acpigen_emit_namestring (src/arch/x86/boot/acpigen.c:203). FROM 0x1103cc is in acpigen_write_processor (src/arch/x86/boot/acpigen.c:70). ~0x0010fb66(0x0010ff03)463048~0x10fb66 is in acpigen_emit_simple_namestring (src/arch/x86/boot/acpigen.c:156). FROM 0x10ff03 is in acpigen_emit_namestring (src/arch/x86/boot/acpigen.c:174). ~0x0010fb66(0x0010ff14)463048~0x10fb66 is in acpigen_emit_simple_namestring (src/arch/x86/boot/acpigen.c:156). FROM 0x10ff14 is in acpigen_emit_namestring (src/arch/x86/boot/acpigen.c:234). ~0x0010fbcf(0x00116dd8)463236~0x10fbcf is in acpigen_write_empty_PCT (src/arch/x86/boot/acpigen.c:283). FROM 0x116dd8 is in amd_model_fxx_generate_powernow (src/cpu/amd/model_fxx/powernow_a It looks like a fun, especially if one can image that the log is printed to raw memory and TSC info is used. The whole log is on assembler.cz/alog.txt.gz which answeres a questions about execution flows ;) I bit changed the annotate script at the end, because it took ages to execute ;) Good method is to just grep all lines with the info to one file, sort -u ask for the rest and just grep in the results for matching lines and intermix with original log. Instead of doing 30000 lines it did only few hundreds. If there is someone with more time it would be great to integrate this somehow. Thanks Rudolf

1 1

Patch set updated: 4e39840 mkelfImage: Use -fno-stack-protector if supported by gcc
by Patrick Georgi 02 Sep '11

02 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/112 -gerrit commit 4e39840e7dcc5c6e1e63359db630b6cde64ce236 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Fri Sep 2 23:40:31 2011 +0200 mkelfImage: Use -fno-stack-protector if supported by gcc Gcc 4.1 comes with an SSP https://wiki.ubuntu.com/GccSsp This is disabled to work around '__stack_chk_fail' symbol not found failures http://www.coreboot.org/FAQ/Obsolete#How_do_I_fix_stack_chk_fail_errors.3F The presence of -fno-stack-protector is tested for automatically Change-Id: I28ef158829f5935f985cfd5a5440733685cf479a Reported-by: Raymond Danks <raymonddanks(a)gmail.com> Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/mkelfImage/Makefile | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/util/mkelfImage/Makefile b/util/mkelfImage/Makefile index cd265cf..63569a9 100644 --- a/util/mkelfImage/Makefile +++ b/util/mkelfImage/Makefile @@ -14,7 +14,16 @@ pkgdatadir = $(datadir)/$(PACKAGE) pkglibdir = $(libdir)/$(PACKAGE) pkgincludedir = $(includedir)/$(PACKAGE) -CPPFLAGS=-DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(RELEASE_DATE)"' -I include +# $1 CC +# $2 flag to test +# $3 make statement to evaluate +testcc=$(if $(shell echo "_start(void) {}" | \ + $(1) -x c -nostdlib $(2) - -o /dev/null > /dev/null 2> /dev/null && echo success),\ + $(eval $(3))) + +CPPFLAGS=-DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(RELEASE_DATE)"' -I include $(CFLAGS) $(LDFLAGS) +$(call testcc,$(CC),-f-nostack-protector,CPPFLAGS+=-fno-stack-protector) + HOST_CPPFLAGS=$(CPPFLAGS) I386_CPPFLAGS=$(CPPFLAGS) -I arch/i386/include IA64_CPPFLAGS=$(CPPFLAGS) -I arch/ia64/include

1 0

Patch merged into master: 61cd2db Fix FILO build system
by gerrit＠coreboot.org 02 Sep '11

02 Sep '11

the following patch was just integrated into master: commit 61cd2db8ae5b41fae9e6baa015e224f55986051e Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Fri Sep 2 22:44:15 2011 +0200 Fix FILO build system This change: - deduplicates a whole lot of stuff in the Kconfig makefile - simplifies "verbose" support (V=1) to match coreboot's style - adds libpayload support to more kconfig targets (allyes, allno, defconfig...) - isolates libpayload build into its own directory to avoid file clashes Change-Id: Iee682492f64f0f5da2a8702b8fe6f8b02c81b4c5 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> See http://review.coreboot.org/177 for details. -gerrit

1 0

Patch set updated: 61cd2db Fix FILO build system
by Patrick Georgi 02 Sep '11

02 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/177 -gerrit commit 61cd2db8ae5b41fae9e6baa015e224f55986051e Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Fri Sep 2 22:44:15 2011 +0200 Fix FILO build system This change: - deduplicates a whole lot of stuff in the Kconfig makefile - simplifies "verbose" support (V=1) to match coreboot's style - adds libpayload support to more kconfig targets (allyes, allno, defconfig...) - isolates libpayload build into its own directory to avoid file clashes Change-Id: Iee682492f64f0f5da2a8702b8fe6f8b02c81b4c5 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- Makefile | 56 +++++----- util/kconfig/Makefile | 285 ++++++++++++++++--------------------------------- 2 files changed, 124 insertions(+), 217 deletions(-) diff --git a/Makefile b/Makefile index 2e8a9e5..1ebf62e 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,11 @@ HAVE_DOTCONFIG := $(wildcard .config) BUILD_INFO = ($(shell whoami)@$(shell hostname)) $(shell LANG=C date) # Make is silent per default, but 'make V=1' will show all compiler calls. +Q=@ ifneq ($(V),1) -Q := @ +ifneq ($(Q),) +.SILENT: +endif endif $(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile))) @@ -114,52 +117,53 @@ libpayload: @printf "Found Libpayload $(LIBPAYLOAD).\n" else libpayload: $(src)/$(LIB_CONFIG) - $(Q)printf "building libpayload.\n" - $(Q)make -C $(LIBCONFIG_PATH) distclean - $(Q)cp lib.config $(LIBCONFIG_PATH)/.config - $(Q)make -C $(LIBCONFIG_PATH) oldconfig - $(Q)make -C $(LIBCONFIG_PATH) DESTDIR=$(src)/build install + printf "building libpayload.\n" + $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build distclean + cp lib.config $(LIBCONFIG_PATH)/.config + mkdir -p $(LIBCONFIG_PATH)/build + $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build oldconfig + $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build DESTDIR=$(src)/build install endif $(obj)/filo: $(src)/.config $(OBJS) libpayload - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) + printf " LD $(subst $(shell pwd)/,,$(@))\n" + $(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) $(TARGET): $(obj)/filo libpayload - $(Q)cp $(obj)/filo $@ - $(Q)$(NM) $(obj)/filo | sort > $(obj)/filo.map - $(Q)printf " STRIP $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(STRIP) -s $@ + cp $(obj)/filo $@ + $(NM) $(obj)/filo | sort > $(obj)/filo.map + printf " STRIP $(subst $(shell pwd)/,,$(@))\n" + $(STRIP) -s $@ include util/kconfig/Makefile $(obj)/%.o: $(src)/%.c libpayload - $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + printf " CC $(subst $(shell pwd)/,,$(@))\n" + $(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $< $(obj)/%.S.o: $(src)/%.S - $(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(AS) $(ASFLAGS) -o $@ $< + printf " AS $(subst $(shell pwd)/,,$(@))\n" + $(AS) $(ASFLAGS) -o $@ $< endif $(obj)/version.h: FORCE - $(Q)echo '#define PROGRAM_NAME "$(PROGRAM_NAME)"' > $@ - $(Q)echo '#define PROGRAM_VERSION "$(PROGRAM_VERSION)"' >> $@ - $(Q)echo '#define PROGRAM_VERSION_FULL "$(PROGRAM_VERSION) $(BUILD_INFO)"' >> $@ - $(Q)echo '#define BUILD_INFO "$(BUILD_INFO)"' >> $@ + echo '#define PROGRAM_NAME "$(PROGRAM_NAME)"' > $@ + echo '#define PROGRAM_VERSION "$(PROGRAM_VERSION)"' >> $@ + echo '#define PROGRAM_VERSION_FULL "$(PROGRAM_VERSION) $(BUILD_INFO)"' >> $@ + echo '#define BUILD_INFO "$(BUILD_INFO)"' >> $@ prepare: - $(Q)mkdir -p $(obj)/util/kconfig/lxdialog - $(Q)mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash - $(Q)mkdir -p $(obj)/main/grub + mkdir -p $(obj)/util/kconfig/lxdialog + mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash + mkdir -p $(obj)/main/grub clean: - $(Q)rm -rf $(obj)/i386 $(obj)/fs $(obj)/drivers $(obj)/main $(obj)/util + rm -rf $(obj)/i386 $(obj)/fs $(obj)/drivers $(obj)/main $(obj)/util distclean: clean - $(Q)rm -rf build - $(Q)rm -f .config lib.config .config.old .xcompile ..config.tmp .kconfig.d .tmpconfig* + rm -rf build + rm -f .config lib.config .config.old .xcompile ..config.tmp .kconfig.d .tmpconfig* FORCE: diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile index d6670fd..64a340c 100644 --- a/util/kconfig/Makefile +++ b/util/kconfig/Makefile @@ -2,7 +2,8 @@ # Kernel configuration targets # These targets are used from top-level makefile -PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config +PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig +PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig _OS=$(shell uname -s |cut -c-7) regex-objs= @@ -17,206 +18,108 @@ LIB_CONFIG := $(src)/lib.config HAVE_FILO_CONFIG := $(wildcard $(FILO_CONFIG)) HAVE_LIB_CONFIG := $(wildcard $(LIB_CONFIG)) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) -xconfig: prepare $(objk)/qconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/qconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/qconf $(Kconfig) -else -xconfig: prepare $(objk)/qconf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif +# We don't know how to cope with FILO config being present and +# libpayload config not. +$(if $(and $(HAVE_FILO_CONFIG),$(filter 0,$(words $(LIB_CONFIG)))), \ + FATAL:=1, \ + FATAL:=0) + +LIBPAYLOAD_CONFIG_PRE := echo "Libpayload config for FILO." \ + $(if $(HAVE_FILO_CONFIG),; mv $(FILO_CONFIG) $(FILO_CONFIG).temp) \ + $(if $(HAVE_LIB_CONFIG),; mv $(LIB_CONFIG) $(FILO_CONFIG)) + +LIBPAYLOAD_CONFIG_POST := mv $(FILO_CONFIG) $(LIB_CONFIG) \ + ; echo "Libpayload config done." \ + $(if $(HAVE_FILO_CONFIG),; mv $(FILO_CONFIG).temp $(FILO_CONFIG)) + +ifeq ($(FATAL),1) +xconfig gconfig menuconfig config oldconfig silentoldconfig: + echo "Lost libpayload config file." + rm -f $(FILO_CONFIG) else xconfig: prepare $(objk)/qconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/qconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/qconf $(Kconfig) -endif + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/qconf $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/qconf $(Kconfig) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) -gconfig: prepare $(objk)/gconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/gconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/gconf $(Kconfig) -else -gconfig: prepare $(objk)/gconf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif -else gconfig: prepare $(objk)/gconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/gconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/gconf $(Kconfig) -endif + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/gconf $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/gconf $(Kconfig) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) -menuconfig: prepare $(objk)/mconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/mconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/mconf $(Kconfig) -else -menuconfig: prepare $(objk)/mconf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif -else menuconfig: prepare $(objk)/mconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/mconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/mconf $(Kconfig) -endif + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/mconf $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/mconf $(Kconfig) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) -config: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/conf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/conf $(Kconfig) -else -config: prepare $(objk)/conf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif -else config: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/conf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/conf $(Kconfig) -endif + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf $(Kconfig) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) -oldconfig: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/conf -o $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/conf -o $(Kconfig) -else oldconfig: prepare $(objk)/conf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif -else -oldconfig: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/conf -o $(LIBCONFIG_PATH)/Config.in - $(Q)mv .config $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/conf -o $(Kconfig) -endif + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -o $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -o $(Kconfig) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) silentoldconfig: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/conf -s $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/conf -s $(Kconfig) -else -silentoldconfig: prepare $(objk)/conf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif -else -silentoldconfig: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/conf -s $(LIBCONFIG_PATH)/Config.in - $(Q)mv .config $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/conf -s $(Kconfig) - -endif - -# --- UNUSED, ignore ---------------------------------------------------------- -# Create new linux.pot file -# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files -# The symlink is used to repair a deficiency in arch/um -update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h - $(Q)echo " GEN config" - $(Q)xgettext --default-domain=linux \ - --add-comments --keyword=_ --keyword=N_ \ - --from-code=UTF-8 \ - --files-from=scripts/kconfig/POTFILES.in \ - --output $(obj)/config.pot - $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot - $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch - $(Q)(for i in `ls arch/`; \ - do \ - echo " GEN $$i"; \ - $(obj)/kxgettext arch/$$i/Kconfig \ - >> $(obj)/config.pot; \ - done ) - $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \ - --output $(obj)/linux.pot - $(Q)rm -f arch/um/Kconfig.arch - $(Q)rm -f $(obj)/config.pot -# --- UNUSED, ignore ---------------------------------------------------------- - -PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -s $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -s $(Kconfig) randconfig: prepare $(objk)/conf - $(Q)$(objk)/conf -r $(Kconfig) + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -r $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -r $(Kconfig) allyesconfig: prepare $(objk)/conf - $(Q)$(objk)/conf -y $(Kconfig) + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -y $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -y $(Kconfig) allnoconfig: prepare $(objk)/conf - $(Q)$(objk)/conf -n $(Kconfig) + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -n $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -n $(Kconfig) allmodconfig: prepare $(objk)/conf - $(Q)$(objk)/conf -m $(Kconfig) + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -m $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -m $(Kconfig) defconfig: prepare $(objk)/conf + $(LIBPAYLOAD_CONFIG_PRE) ifeq ($(KBUILD_DEFCONFIG),) - $(Q)$(objk)/conf -d $(Kconfig) + $(objk)/conf -D $(LIBCONFIG_PATH)/configs/defconfig $(LIBCONFIG_PATH)/Config.in else @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" - $(Q)$(objk)/conf -D $(KBUILD_DEFCONFIG) $(Kconfig) + $(objk)/conf -D $(LIBCONFIG_PATH)/$(KBUILD_DEFCONFIG) $(LIBCONFIG_PATH)/Config.in +endif + $(LIBPAYLOAD_CONFIG_POST) +ifeq ($(KBUILD_DEFCONFIG),) + $(objk)/conf -d $(Kconfig) +else + @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" + $(objk)/conf -D $(KBUILD_DEFCONFIG) $(Kconfig) endif %_defconfig: prepare $(objk)/conf - $(Q)$(objk)/conf -D configs/$@ $(Kconfig) + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -D $(LIBCONFIG_PATH)/configs/$@ $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -D configs/$@ $(Kconfig) + +endif # "FATAL" # Help text used by make help help: @@ -293,7 +196,7 @@ clean-files += config.pot coreinfo.pot PHONY += $(objk)/dochecklxdialog $(addprefix $(obj)/,$(lxdialog)): $(objk)/dochecklxdialog $(objk)/dochecklxdialog: - $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) + $(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) always := dochecklxdialog @@ -438,46 +341,46 @@ endif $(objk)/qconf: $(patsubst %,$(objk)/%,$(qconf-cxxobjs)) \ $(patsubst %,$(objk)/%,$(qconf-objs)) - $(Q)$(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTLOADLIBES_qconf) -o $@ $^ + $(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTLOADLIBES_qconf) -o $@ $^ $(objk)/gconf: $(patsubst %,$(objk)/%,$(gconf-objs)) - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOSTLOADLIBES_gconf) -o $@ $^ + $(HOSTCC) $(HOSTCFLAGS) $(HOSTLOADLIBES_gconf) -o $@ $^ $(objk)/mconf: $(patsubst %,$(objk)/%,$(mconf-objs)) - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) -o $@ $^ + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) -o $@ $^ $(objk)/conf: $(patsubst %,$(objk)/%,$(conf-objs)) - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^ + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^ $(objk)/mconf.o: $(srck)/mconf.c - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< $(objk)/conf.o: $(srck)/conf.c - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< $(objk)/regex.o: $(srck)/regex.c $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -DHAVE_STRING_H -c -o $@ $< $(objk)/zconf.tab.o: $(objk)/zconf.tab.c $(objk)/lex.zconf.c \ $(objk)/zconf.hash.c - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $(objk)/zconf.tab.c + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $(objk)/zconf.tab.c $(objk)/kconfig_load.o: $(srck)/kconfig_load.c $(objk)/lkc_defs.h - $(Q)$(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< $(objk)/qconf.o: $(srck)/qconf.cc $(objk)/qconf.moc $(objk)/lkc_defs.h - $(Q)$(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTCXXFLAGS_qconf.o) -c -o $@ $< + $(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTCXXFLAGS_qconf.o) -c -o $@ $< $(objk)/gconf.o: $(srck)/gconf.c $(objk)/lkc_defs.h - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOSTCFLAGS_gconf.o) -c -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) $(HOSTCFLAGS_gconf.o) -c -o $@ $< $(objk)/%.moc: $(srck)/%.h - $(Q)$(KC_QT_MOC) -i $< -o $@ + $(KC_QT_MOC) -i $< -o $@ $(objk)/lkc_defs.h: $(srck)/lkc_proto.h - $(Q)sed < $< > $@ 's/P($[^,]*$,.*/#define \1 (\*\1_p)/' + sed < $< > $@ 's/P($[^,]*$,.*/#define \1 (\*\1_p)/' $(objk)/lex.zconf.c: $(srck)/lex.zconf.c_shipped - $(Q)cp $< $@ + cp $< $@ $(objk)/zconf.hash.c: $(srck)/zconf.hash.c_shipped - $(Q)cp $< $@ + cp $< $@ $(objk)/zconf.tab.c: $(srck)/zconf.tab.c_shipped - $(Q)cp $< $@ + cp $< $@ $(objk)/lxdialog/lxdialog: $(objk)/dochecklxdialog \ $(patsubst %,$(objk)/lxdialog/%,$(lxdialog)) - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) \ + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) \ $(patsubst %,$(objk)/lxdialog/%,$(lxdialog)) -o $@ $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@ + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@

1 0

Patch merged into master: ad9b1d8 Adapt filo to libpayload changes
by gerrit＠coreboot.org 02 Sep '11

02 Sep '11

the following patch was just integrated into master: commit ad9b1d81d3f46ccab9e7fc5570b0b8d495386547 Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Fri Jul 22 10:00:38 2011 +0200 Adapt filo to libpayload changes libpayload comes with CBFS and LZMA support now, and FILO's copy leads to conflicts (which is what the libpayload copy intends to solve) Change-Id: I1c70eda7b260d7149c7079cb0d681c274f510ed8 Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> See http://review.coreboot.org/116 for details. -gerrit

1 0

Patch set updated: 7f65f07 Add POSIXy readdir/scandir support
by Patrick Georgi 02 Sep '11

02 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/119 -gerrit commit 7f65f079c80bf52ff9e2f12b3c118ad3dcb5647b Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Tue Jul 19 16:38:23 2011 +0200 Add POSIXy readdir/scandir support This abuses the print_a_completion mechanism to build the right data structures to support opendir/readdir/closedir and scandir on top of them. It's BSD-licensed so it can eventually be moved over to libpayload. Change-Id: Iadc1daed3cab4cf2ead778c23ad756d36cbbb99a Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- fs/vfs.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++- include/dirent.h | 28 +++++++++++ include/grub/shared.h | 2 +- main/grub/completions.c | 27 ----------- 4 files changed, 146 insertions(+), 29 deletions(-) diff --git a/fs/vfs.c b/fs/vfs.c index 49b38d8..18dbcbc 100644 --- a/fs/vfs.c +++ b/fs/vfs.c @@ -24,6 +24,7 @@ #include <config.h> #include <fs.h> #include "filesys.h" +#include <dirent.h> #define DEBUG_THIS CONFIG_DEBUG_VFS #include <debug.h> @@ -241,7 +242,7 @@ void file_close(void) devclose(); } -int dir(char *dirname) +int dir(const char *dirname) { char *dev = 0; const char *path; @@ -300,6 +301,8 @@ int dir(char *dirname) retval = fsys->dir_func((char *) path); + print_possibilities = 0; + out: if (dev) free(dev); @@ -307,4 +310,117 @@ out: return retval; } +/* The following functions are BSD-L, Copyright 2011 secunet AG + * licensing is chosen to simplify migration to libpayload at some point */ + +struct dirent **opendir_s; +int opendir_ssize, opendir_selem; + +void print_a_completion(char *name) +{ + opendir_s[opendir_selem] = malloc(sizeof(struct dirent)); + opendir_s[opendir_selem]->d_name = strdup(name); + opendir_selem++; + if (opendir_selem == opendir_ssize) { + opendir_ssize *= 2; + opendir_s = realloc(opendir_s, sizeof(struct dirent*)*opendir_ssize); + } + opendir_s[opendir_selem] = 0; +} + +DIR *opendir(const char *path) +{ + DIR *p = malloc(sizeof(DIR)); + + if (opendir_s) free(opendir_s); + opendir_ssize = 32; + opendir_selem = 0; + opendir_s = malloc(sizeof(struct dirent*)*opendir_ssize); + dir(path); + p->items = opendir_s; + p->cur = opendir_s; + return p; +} + +struct dirent *readdir(DIR *dirp) +{ + if (NULL == *dirp->cur) return NULL; + + return *(dirp->cur++); +} + +int closedir(DIR *dirp) +{ + if (!dirp) return -1; + + struct dirent **cur = dirp->items; + while (*cur) { + free(*cur); + cur++; + } + free(dirp->items); + free(dirp); + + return 0; +} + +static int (*metafilter_flt)(const struct dirent *); +static int (*metafilter_cmp)(const struct dirent **, const struct dirent **); + +static int metafilter(const struct dirent **a, const struct dirent **b) +{ + /* make sure that filtered out entries end up at the end, for simple elimination */ + if ((metafilter_flt(*a) == 0) && (metafilter_flt(*b) == 0)) + return 0; + if (metafilter_flt(*a) == 0) + return 1; + if (metafilter_flt(*b) == 0) + return -1; + return metafilter_cmp(a, b); +} + +int scandir(const char *path, struct dirent ***namelist, + int (*filter)(const struct dirent *), + int (*compar)(const struct dirent **, const struct dirent **)) +{ + DIR *dirp = opendir(path); + + struct dirent **e = dirp->items; + int nelem = 0; + while (*e) { + nelem++; + e++; + } + + if (filter) { + metafilter_flt = filter; + metafilter_cmp = compar; + compar = metafilter; + } + + *namelist = malloc(sizeof(struct dirent*)*nelem); + memcpy(*namelist, dirp->items, sizeof(struct dirent*)*nelem); + qsort(*namelist, nelem, sizeof(struct dirent*), (int(*)(const void*, const void*))compar); + + // if things were filtered, truncate them away + if (filter) { + int nelem2; + e = *namelist; + nelem2 = 0; + while ((nelem > nelem2) && filter(*e)) { + nelem2++; + e++; + } + realloc(namelist, sizeof(struct dirent**)*nelem2); + } + + return nelem; +} + +int alphasort(const struct dirent **a, const struct dirent **b) +{ + const struct dirent *a1 = *(const struct dirent **)(a); + const struct dirent *b1 = *(const struct dirent **)(b); + return strcmp(a1->d_name, b1->d_name); +} diff --git a/include/dirent.h b/include/dirent.h new file mode 100644 index 0000000..19b3696 --- /dev/null +++ b/include/dirent.h @@ -0,0 +1,28 @@ +/* Copyright 2011 secunet AG + * written by Patrick Georgi <patrick.georgi(a)secunet.com> + * + * Licensed as BSD-L to ease migration to libpayload */ + +#ifndef __DIRENT_H +#define __DIRENT_H +struct dirent { + char *d_name; +}; + +typedef struct { + struct dirent **items; + struct dirent **cur; +} DIR; + +DIR *opendir(const char *path); +struct dirent *readdir(DIR *dirp); +int closedir(DIR *dirp); // 0 on success, -1 on error, with errno set + +int scandir(const char *path, struct dirent ***namelist, + int (*filter)(const struct dirent *), + int (*compar)(const struct dirent **, const struct dirent **)); + +int alphasort(const struct dirent **a, const struct dirent **b); + +#endif + diff --git a/include/grub/shared.h b/include/grub/shared.h index 8d876de..127b74f 100644 --- a/include/grub/shared.h +++ b/include/grub/shared.h @@ -295,7 +295,7 @@ void grub_putstr (const char *str); /* List the contents of the directory that was opened with GRUB_OPEN, printing all completions. */ -int dir (char *dirname); +int dir (const char *dirname); /* Display device and filename completions. */ void print_a_completion (char *filename); diff --git a/main/grub/completions.c b/main/grub/completions.c index 6588301..161026b 100644 --- a/main/grub/completions.c +++ b/main/grub/completions.c @@ -64,33 +64,6 @@ set_device (char *device) return 0; } -/* If DO_COMPLETION is true, just print NAME. Otherwise save the unique - part into UNIQUE_STRING. */ -void print_a_completion(char *name) -{ - /* If NAME is "." or "..", do not count it. */ - if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0) - return; - - if (do_completion) { - char *buf = unique_string; - - if (!unique) - while ((*buf++ = *name++)); - else { - while (*buf && (*buf == *name)) { - buf++; - name++; - } - /* mismatch, strip it. */ - *buf = '\0'; - } - } else - grub_printf(" %s", name); - - unique++; -} - /* * This lists the possible completions of a device string, filename, or * any sane combination of the two.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot September 2011