Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/Makefile (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -40,4 +40,5 @@ app/mkfat \ app/redir \ + app/taskdump \ app/tester \ app/tetris \ @@ -47,4 +48,5 @@ srv/loader \ srv/ns \ + srv/taskmon \ srv/vfs \ srv/bd/ata_bd \ Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/app/init/init.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -233,4 +233,18 @@ } +static void mount_scratch(void) +{ + int rc; + + printf("Trying to mount null/0 on /scratch... "); + fflush(stdout); + + rc = mount("tmpfs", "/scratch", "null/0", "", 0); + if (rc == EOK) + printf("OK\n"); + else + printf("Failed\n"); +} + static void mount_data(void) { @@ -255,6 +269,12 @@ return -1; } + + /* Make sure tmpfs is running. */ + if (str_cmp(STRING(RDFMT), "tmpfs") != 0) { + spawn("/srv/tmpfs"); + } spawn("/srv/devfs"); + spawn("/srv/taskmon"); if (!mount_devfs()) { @@ -262,4 +282,6 @@ return -2; } + + mount_scratch(); spawn("/srv/fhc"); Index: uspace/app/mkfat/mkfat.c =================================================================== --- uspace/app/mkfat/mkfat.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/app/mkfat/mkfat.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -44,4 +44,7 @@ #include #include +#include +#include +#include #include #include "fat.h" @@ -157,5 +160,6 @@ printf(NAME ": Warning, failed to obtain block device size.\n"); } else { - printf(NAME ": Block device has %llu blocks.\n", dev_nblocks); + printf(NAME ": Block device has %" PRIuBN " blocks.\n", + dev_nblocks); cfg.total_sectors = dev_nblocks; } Index: uspace/app/taskdump/Makefile =================================================================== --- uspace/app/taskdump/Makefile (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/app/taskdump/Makefile (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,39 @@ +# +# Copyright (c) 2010 Jiri Svoboda +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +LIBS = $(LIBC_PREFIX)/libc.a +EXTRA_CFLAGS = -Iinclude + +OUTPUT = taskdump + +SOURCES = \ + taskdump.c \ + symtab.c + +include ../Makefile.common Index: uspace/app/taskdump/include/elf.h =================================================================== --- uspace/app/taskdump/include/elf.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/app/taskdump/include/elf.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,344 @@ +/* + * Copyright (c) 2006 Sergey Bondari + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup generic + * @{ + */ +/** @file + */ + +#ifndef ELF_H_ +#define ELF_H_ + +#include +#include + +/** + * current ELF version + */ +#define EV_CURRENT 1 + +/** + * ELF types + */ +#define ET_NONE 0 /* No type */ +#define ET_REL 1 /* Relocatable file */ +#define ET_EXEC 2 /* Executable */ +#define ET_DYN 3 /* Shared object */ +#define ET_CORE 4 /* Core */ +#define ET_LOPROC 0xff00 /* Processor specific */ +#define ET_HIPROC 0xffff /* Processor specific */ + +/** + * ELF machine types + */ +#define EM_NO 0 /* No machine */ +#define EM_SPARC 2 /* SPARC */ +#define EM_386 3 /* i386 */ +#define EM_MIPS 8 /* MIPS RS3000 */ +#define EM_MIPS_RS3_LE 10 /* MIPS RS3000 LE */ +#define EM_PPC 20 /* PPC32 */ +#define EM_PPC64 21 /* PPC64 */ +#define EM_ARM 40 /* ARM */ +#define EM_SPARCV9 43 /* SPARC64 */ +#define EM_IA_64 50 /* IA-64 */ +#define EM_X86_64 62 /* AMD64/EMT64 */ + +/** + * ELF identification indexes + */ +#define EI_MAG0 0 +#define EI_MAG1 1 +#define EI_MAG2 2 +#define EI_MAG3 3 +#define EI_CLASS 4 /* File class */ +#define EI_DATA 5 /* Data encoding */ +#define EI_VERSION 6 /* File version */ +#define EI_OSABI 7 +#define EI_ABIVERSION 8 +#define EI_PAD 9 /* Start of padding bytes */ +#define EI_NIDENT 16 /* ELF identification table size */ + +/** + * ELF magic number + */ +#define ELFMAG0 0x7f +#define ELFMAG1 'E' +#define ELFMAG2 'L' +#define ELFMAG3 'F' + +/** + * ELF file classes + */ +#define ELFCLASSNONE 0 +#define ELFCLASS32 1 +#define ELFCLASS64 2 + +/** + * ELF data encoding types + */ +#define ELFDATANONE 0 +#define ELFDATA2LSB 1 /* Least significant byte first (little endian) */ +#define ELFDATA2MSB 2 /* Most signigicant byte first (big endian) */ + +/** + * ELF error return codes + */ +#define EE_OK 0 /* No error */ +#define EE_INVALID 1 /* Invalid ELF image */ +#define EE_MEMORY 2 /* Cannot allocate address space */ +#define EE_INCOMPATIBLE 3 /* ELF image is not compatible with current architecture */ +#define EE_UNSUPPORTED 4 /* Non-supported ELF (e.g. dynamic ELFs) */ +#define EE_IRRECOVERABLE 5 + +/** + * ELF section types + */ +#define SHT_NULL 0 +#define SHT_PROGBITS 1 +#define SHT_SYMTAB 2 +#define SHT_STRTAB 3 +#define SHT_RELA 4 +#define SHT_HASH 5 +#define SHT_DYNAMIC 6 +#define SHT_NOTE 7 +#define SHT_NOBITS 8 +#define SHT_REL 9 +#define SHT_SHLIB 10 +#define SHT_DYNSYM 11 +#define SHT_LOOS 0x60000000 +#define SHT_HIOS 0x6fffffff +#define SHT_LOPROC 0x70000000 +#define SHT_HIPROC 0x7fffffff +#define SHT_LOUSER 0x80000000 +#define SHT_HIUSER 0xffffffff + +/** + * ELF section flags + */ +#define SHF_WRITE 0x1 +#define SHF_ALLOC 0x2 +#define SHF_EXECINSTR 0x4 +#define SHF_TLS 0x400 +#define SHF_MASKPROC 0xf0000000 + +/** + * Symbol binding + */ +#define STB_LOCAL 0 +#define STB_GLOBAL 1 +#define STB_WEAK 2 +#define STB_LOPROC 13 +#define STB_HIPROC 15 + +/** + * Symbol types + */ +#define STT_NOTYPE 0 +#define STT_OBJECT 1 +#define STT_FUNC 2 +#define STT_SECTION 3 +#define STT_FILE 4 +#define STT_LOPROC 13 +#define STT_HIPROC 15 + +/** + * Program segment types + */ +#define PT_NULL 0 +#define PT_LOAD 1 +#define PT_DYNAMIC 2 +#define PT_INTERP 3 +#define PT_NOTE 4 +#define PT_SHLIB 5 +#define PT_PHDR 6 +#define PT_LOPROC 0x70000000 +#define PT_HIPROC 0x7fffffff + +/** + * Program segment attributes. + */ +#define PF_X 1 +#define PF_W 2 +#define PF_R 4 + +/** + * ELF data types + * + * These types are found to be identical in both 32-bit and 64-bit + * ELF object file specifications. They are the only types used + * in ELF header. + */ +typedef uint64_t elf_xword; +typedef int64_t elf_sxword; +typedef uint32_t elf_word; +typedef int32_t elf_sword; +typedef uint16_t elf_half; + +/** + * 32-bit ELF data types. + * + * These types are specific for 32-bit format. + */ +typedef uint32_t elf32_addr; +typedef uint32_t elf32_off; + +/** + * 64-bit ELF data types. + * + * These types are specific for 64-bit format. + */ +typedef uint64_t elf64_addr; +typedef uint64_t elf64_off; + +/** ELF header */ +struct elf32_header { + uint8_t e_ident[EI_NIDENT]; + elf_half e_type; + elf_half e_machine; + elf_word e_version; + elf32_addr e_entry; + elf32_off e_phoff; + elf32_off e_shoff; + elf_word e_flags; + elf_half e_ehsize; + elf_half e_phentsize; + elf_half e_phnum; + elf_half e_shentsize; + elf_half e_shnum; + elf_half e_shstrndx; +}; +struct elf64_header { + uint8_t e_ident[EI_NIDENT]; + elf_half e_type; + elf_half e_machine; + elf_word e_version; + elf64_addr e_entry; + elf64_off e_phoff; + elf64_off e_shoff; + elf_word e_flags; + elf_half e_ehsize; + elf_half e_phentsize; + elf_half e_phnum; + elf_half e_shentsize; + elf_half e_shnum; + elf_half e_shstrndx; +}; + +/* + * ELF segment header. + * Segments headers are also known as program headers. + */ +struct elf32_segment_header { + elf_word p_type; + elf32_off p_offset; + elf32_addr p_vaddr; + elf32_addr p_paddr; + elf_word p_filesz; + elf_word p_memsz; + elf_word p_flags; + elf_word p_align; +}; +struct elf64_segment_header { + elf_word p_type; + elf_word p_flags; + elf64_off p_offset; + elf64_addr p_vaddr; + elf64_addr p_paddr; + elf_xword p_filesz; + elf_xword p_memsz; + elf_xword p_align; +}; + +/* + * ELF section header + */ +struct elf32_section_header { + elf_word sh_name; + elf_word sh_type; + elf_word sh_flags; + elf32_addr sh_addr; + elf32_off sh_offset; + elf_word sh_size; + elf_word sh_link; + elf_word sh_info; + elf_word sh_addralign; + elf_word sh_entsize; +}; +struct elf64_section_header { + elf_word sh_name; + elf_word sh_type; + elf_xword sh_flags; + elf64_addr sh_addr; + elf64_off sh_offset; + elf_xword sh_size; + elf_word sh_link; + elf_word sh_info; + elf_xword sh_addralign; + elf_xword sh_entsize; +}; + +/* + * ELF symbol table entry + */ +struct elf32_symbol { + elf_word st_name; + elf32_addr st_value; + elf_word st_size; + uint8_t st_info; + uint8_t st_other; + elf_half st_shndx; +}; +struct elf64_symbol { + elf_word st_name; + uint8_t st_info; + uint8_t st_other; + elf_half st_shndx; + elf64_addr st_value; + elf_xword st_size; +}; + +#ifdef __32_BITS__ +typedef struct elf32_header elf_header_t; +typedef struct elf32_segment_header elf_segment_header_t; +typedef struct elf32_section_header elf_section_header_t; +typedef struct elf32_symbol elf_symbol_t; +#endif +#ifdef __64_BITS__ +typedef struct elf64_header elf_header_t; +typedef struct elf64_segment_header elf_segment_header_t; +typedef struct elf64_section_header elf_section_header_t; +typedef struct elf64_symbol elf_symbol_t; +#endif + +extern char *elf_error(unsigned int rc); + +#endif + +/** @} + */ Index: uspace/app/taskdump/include/symtab.h =================================================================== --- uspace/app/taskdump/include/symtab.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/app/taskdump/include/symtab.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2008 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup debug + * @{ + */ +/** @file + */ + +#ifndef SYMTAB_H_ +#define SYMTAB_H_ + +#include +#include + +typedef struct { + /** Symbol section */ + elf_symbol_t *sym; + size_t sym_size; + /** String table */ + char *strtab; + size_t strtab_size; +} symtab_t; + +extern int symtab_load(const char *file_name, symtab_t **symtab); +extern void symtab_delete(symtab_t *st); +extern int symtab_name_to_addr(symtab_t *st, char *name, uintptr_t *addr); +extern int symtab_addr_to_name(symtab_t *symtab, uintptr_t addr, char **name, + size_t *offs); + +#endif + +/** @} + */ Index: uspace/app/taskdump/symtab.c =================================================================== --- uspace/app/taskdump/symtab.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/app/taskdump/symtab.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,373 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup debug + * @{ + */ +/** @file Handling of ELF symbol tables. + * + * This module allows one to load a symbol table from an ELF file and + * use it to lookup symbol names/addresses in both directions. + */ + +#include +#include +#include +#include +#include +#include + +#include +#include "include/symtab.h" + +static int elf_hdr_check(elf_header_t *hdr); +static int section_hdr_load(int fd, const elf_header_t *ehdr, int idx, + elf_section_header_t *shdr); +static int chunk_load(int fd, off_t start, off_t size, void **ptr); +static int read_all(int fd, void *buf, size_t len); + +/** Load symbol table from an ELF file. + * + * @param file_name Name of the ELF file to read from. + * @param symtab Place to save pointer to new symtab structure. + * + * @return EOK on success, ENOENT if file could not be open, + * ENOTSUP if file parsing failed. + */ +int symtab_load(const char *file_name, symtab_t **symtab) +{ + symtab_t *stab; + elf_header_t elf_hdr; + elf_section_header_t sec_hdr; + off_t shstrt_start, shstrt_size; + char *shstrt, *sec_name; + void *data; + + int fd; + int rc; + int i; + + bool load_sec, sec_is_symtab; + + *symtab = NULL; + + stab = calloc(1, sizeof(symtab_t)); + if (stab == NULL) + return ENOMEM; + + fd = open(file_name, O_RDONLY); + if (fd < 0) { + printf("failed opening file\n"); + free(stab); + return ENOENT; + } + + rc = read_all(fd, &elf_hdr, sizeof(elf_header_t)); + if (rc != EOK) { + printf("failed reading elf header\n"); + free(stab); + return EIO; + } + + rc = elf_hdr_check(&elf_hdr); + if (rc != EOK) { + printf("failed header check\n"); + free(stab); + return ENOTSUP; + } + + /* + * Load section header string table. + */ + + rc = section_hdr_load(fd, &elf_hdr, elf_hdr.e_shstrndx, &sec_hdr); + if (rc != EOK) { + printf("failed reading shstrt header\n"); + free(stab); + return ENOTSUP; + } + + shstrt_start = sec_hdr.sh_offset; + shstrt_size = sec_hdr.sh_size; + + rc = chunk_load(fd, shstrt_start, shstrt_size, (void **) &shstrt); + if (rc != EOK) { + printf("failed loading shstrt\n"); + free(stab); + return ENOTSUP; + } + + /* Read all section headers. */ + for (i = 0; i < elf_hdr.e_shnum; ++i) { + rc = section_hdr_load(fd, &elf_hdr, i, &sec_hdr); + if (rc != EOK) { + free(shstrt); + free(stab); + return ENOTSUP; + } + + sec_name = shstrt + sec_hdr.sh_name; + if (str_cmp(sec_name, ".symtab") == 0 && + sec_hdr.sh_type == SHT_SYMTAB) { + load_sec = true; + sec_is_symtab = true; + } else if (str_cmp(sec_name, ".strtab") == 0 && + sec_hdr.sh_type == SHT_STRTAB) { + load_sec = true; + sec_is_symtab = false; + } else { + load_sec = false; + } + + if (load_sec) { + rc = chunk_load(fd, sec_hdr.sh_offset, sec_hdr.sh_size, + &data); + if (rc != EOK) { + free(shstrt); + free(stab); + return ENOTSUP; + } + + if (sec_is_symtab) { + stab->sym = data; + stab->sym_size = sec_hdr.sh_size; + } else { + stab->strtab = data; + stab->strtab_size = sec_hdr.sh_size; + } + } + } + + free(shstrt); + close(fd); + + if (stab->sym == NULL || stab->strtab == NULL) { + /* Tables not found. */ + printf("Symbol table or string table section not found\n"); + free(stab); + return ENOTSUP; + } + + *symtab = stab; + + return EOK; +} + +/** Delete a symtab structure. + * + * Deallocates all resources used by the symbol table. + */ +void symtab_delete(symtab_t *st) +{ + free(st->sym); + st->sym = NULL; + + free(st->strtab); + st->strtab = NULL; + + free(st); +} + +/** Convert symbol name to address. + * + * @param st Symbol table. + * @param name Name of the symbol. + * @param addr Place to store address for symbol, if found. + * + * @return EOK on success, ENOENT if no such symbol was found. + */ +int symtab_name_to_addr(symtab_t *st, char *name, uintptr_t *addr) +{ + size_t i; + char *sname; + + for (i = 0; i < st->sym_size / sizeof(elf_symbol_t); ++i) { + if (st->sym[i].st_name == 0) + continue; + + sname = st->strtab + st->sym[i].st_name; + + if (str_cmp(sname, name) == 0) { + *addr = st->sym[i].st_value; + return EOK; + } + } + + return ENOENT; +} + +/** Convert symbol address to name. + * + * This function finds the symbol which starts at the highest address + * less than or equal to @a addr. + * + * @param st Symbol table. + * @param addr Address for lookup. + * @param name Place to store pointer name of symbol, if found. + * This is valid while @a st exists. + * + * @return EOK on success or ENOENT if no matching symbol was found. + */ +int symtab_addr_to_name(symtab_t *st, uintptr_t addr, char **name, + size_t *offs) +{ + size_t i; + uintptr_t saddr, best_addr; + char *sname, *best_name; + + best_name = NULL; + best_addr = 0; + + for (i = 0; i < st->sym_size / sizeof(elf_symbol_t); ++i) { + if (st->sym[i].st_name == 0) + continue; + + saddr = st->sym[i].st_value; + sname = st->strtab + st->sym[i].st_name; + + if (best_name == NULL || (saddr <= addr && saddr > best_addr)) { + best_name = sname; + best_addr = saddr; + } + } + + if (best_name == NULL) + return ENOENT; + + *name = best_name; + *offs = addr - best_addr; + return EOK; +} + +/** Check if ELF header is valid. + * + * @return EOK on success or negative error code. + */ +static int elf_hdr_check(elf_header_t *ehdr) +{ + /* TODO */ + return EOK; +} + +/** Load ELF section header. + * + * @param fd File descriptor of ELF file. + * @param elf_hdr Pointer to ELF file header in memory. + * @param idx Index of section whose header to load (0 = first). + * @param sec_hdr Place to store section header data. + * + * @return EOK on success or EIO if I/O failed. + */ +static int section_hdr_load(int fd, const elf_header_t *elf_hdr, int idx, + elf_section_header_t *sec_hdr) +{ + int rc; + + rc = lseek(fd, elf_hdr->e_shoff + idx * sizeof(elf_section_header_t), + SEEK_SET); + if (rc == (off_t) -1) + return EIO; + + rc = read_all(fd, sec_hdr, sizeof(elf_section_header_t)); + if (rc != EOK) + return EIO; + + return EOK; +} + +/** Load a segment of bytes from a file and return it as a new memory block. + * + * This function fails if it cannot read exactly @a size bytes from the file. + * + * @param fd File to read from. + * @param start Position in file where to start reading. + * @param size Number of bytes to read. + * @param ptr Place to store pointer to newly allocated block. + * + * @return EOK on success or EIO on failure. + */ +static int chunk_load(int fd, off_t start, off_t size, void **ptr) +{ + int rc; + + rc = lseek(fd, start, SEEK_SET); + if (rc == (off_t) -1) { + printf("failed seeking chunk\n"); + *ptr = NULL; + return EIO; + } + + *ptr = malloc(size); + if (*ptr == NULL) { + printf("failed allocating memory\n"); + return ENOMEM; + } + + rc = read_all(fd, *ptr, size); + if (rc != EOK) { + printf("failed reading chunk\n"); + free(*ptr); + *ptr = NULL; + return EIO; + } + + return EOK; +} + +/** Read until the buffer is read in its entirety. + * + * This function fails if it cannot read exactly @a len bytes from the file. + * + * @param fd The file to read from. + * @param buf Buffer for storing data, @a len bytes long. + * @param len Number of bytes to read. + * + * @return EOK on error, EIO if file is short or return value + * from read() if reading failed. + */ +static int read_all(int fd, void *buf, size_t len) +{ + int cnt = 0; + + do { + buf += cnt; + len -= cnt; + cnt = read(fd, buf, len); + } while (cnt > 0 && (len - cnt) > 0); + + if (cnt < 0) + return cnt; + + if (len - cnt > 0) + return EIO; + + return EOK; +} + +/** @} + */ Index: uspace/app/taskdump/taskdump.c =================================================================== --- uspace/app/taskdump/taskdump.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/app/taskdump/taskdump.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,536 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup taskdump + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#define LINE_BYTES 16 + +#define DBUF_SIZE 4096 +static uint8_t data_buf[DBUF_SIZE]; + +static int phoneid; +static task_id_t task_id; +static bool dump_memory; +static char *app_name; +static symtab_t *app_symtab; + +static int connect_task(task_id_t task_id); +static int parse_args(int argc, char *argv[]); +static void print_syntax(void); +static int threads_dump(void); +static int thread_dump(uintptr_t thash); +static int areas_dump(void); +static int area_dump(as_area_info_t *area); +static void hex_dump(uintptr_t addr, void *buffer, size_t size); +static int td_read_uintptr(void *arg, uintptr_t addr, uintptr_t *value); + +static void autoload_syms(void); +static char *get_app_task_name(void); +static char *fmt_sym_address(uintptr_t addr); + +int main(int argc, char *argv[]) +{ + int rc; + + /* + * FIXME: The stdio module cannot currently detect whether we are + * writing to a console or file. This workaround make file output + * faster. + */ + setvbuf(stdout, NULL, _IOFBF, 32768); + + printf("Task Dump Utility\n"); + dump_memory = false; + + if (parse_args(argc, argv) < 0) + return 1; + + rc = connect_task(task_id); + if (rc < 0) { + printf("Failed connecting to task %" PRIdTASKID ".\n", task_id); + return 1; + } + + app_name = get_app_task_name(); + app_symtab = NULL; + + printf("Dumping task '%s' (task ID %" PRIdTASKID ").\n", app_name, task_id); + autoload_syms(); + putchar('\n'); + + rc = threads_dump(); + if (rc < 0) + printf("Failed dumping threads.\n"); + + rc = areas_dump(); + if (rc < 0) + printf("Failed dumping address space areas.\n"); + + udebug_end(phoneid); + ipc_hangup(phoneid); + + return 0; +} + +static int connect_task(task_id_t task_id) +{ + int rc; + + rc = ipc_connect_kbox(task_id); + + if (rc == ENOTSUP) { + printf("You do not have userspace debugging support " + "compiled in the kernel.\n"); + printf("Compile kernel with 'Support for userspace debuggers' " + "(CONFIG_UDEBUG) enabled.\n"); + return rc; + } + + if (rc < 0) { + printf("Error connecting\n"); + printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc); + return rc; + } + + phoneid = rc; + + rc = udebug_begin(phoneid); + if (rc < 0) { + printf("udebug_begin() -> %d\n", rc); + return rc; + } + + return 0; +} + +static int parse_args(int argc, char *argv[]) +{ + char *arg; + char *err_p; + + task_id = 0; + + --argc; ++argv; + + while (argc > 0) { + arg = *argv; + if (arg[0] == '-') { + if (arg[1] == 't' && arg[2] == '\0') { + /* Task ID */ + --argc; ++argv; + task_id = strtol(*argv, &err_p, 10); + if (*err_p) { + printf("Task ID syntax error\n"); + print_syntax(); + return -1; + } + } else if (arg[1] == 'm' && arg[2] == '\0') { + dump_memory = true; + } else { + printf("Uknown option '%s'\n", arg[0]); + print_syntax(); + return -1; + } + } else { + break; + } + + --argc; ++argv; + } + + if (task_id == 0) { + printf("Missing task ID argument\n"); + print_syntax(); + return -1; + } + + if (argc != 0) { + printf("Extra arguments\n"); + print_syntax(); + return -1; + } + + return 0; +} + +static void print_syntax(void) +{ + printf("Syntax: taskdump [-m] -t \n"); + printf("\t-m\tDump memory area contents.\n"); + printf("\t-t \tWhich task to dump.\n"); +} + +static int threads_dump(void) +{ + uintptr_t *thash_buf; + uintptr_t dummy_buf; + size_t buf_size, n_threads; + + size_t copied; + size_t needed; + size_t i; + int rc; + + /* TODO: See why NULL does not work. */ + rc = udebug_thread_read(phoneid, &dummy_buf, 0, &copied, &needed); + if (rc < 0) { + printf("udebug_thread_read() -> %d\n", rc); + return rc; + } + + if (needed == 0) { + printf("No threads.\n\n"); + return 0; + } + + buf_size = needed; + thash_buf = malloc(buf_size); + + rc = udebug_thread_read(phoneid, thash_buf, buf_size, &copied, &needed); + if (rc < 0) { + printf("udebug_thread_read() -> %d\n", rc); + return rc; + } + + assert(copied == buf_size); + assert(needed == buf_size); + + n_threads = copied / sizeof(uintptr_t); + + printf("Threads:\n"); + for (i = 0; i < n_threads; i++) { + printf(" [%d] hash: %p\n", 1+i, thash_buf[i]); + + thread_dump(thash_buf[i]); + } + putchar('\n'); + + free(thash_buf); + + return 0; +} + +static int areas_dump(void) +{ + as_area_info_t *ainfo_buf; + as_area_info_t dummy_buf; + size_t buf_size, n_areas; + + size_t copied; + size_t needed; + size_t i; + int rc; + + rc = udebug_areas_read(phoneid, &dummy_buf, 0, &copied, &needed); + if (rc < 0) { + printf("udebug_areas_read() -> %d\n", rc); + return rc; + } + + buf_size = needed; + ainfo_buf = malloc(buf_size); + + rc = udebug_areas_read(phoneid, ainfo_buf, buf_size, &copied, &needed); + if (rc < 0) { + printf("udebug_areas_read() -> %d\n", rc); + return rc; + } + + assert(copied == buf_size); + assert(needed == buf_size); + + n_areas = copied / sizeof(as_area_info_t); + + printf("Address space areas:\n"); + for (i = 0; i < n_areas; i++) { + printf(" [%d] flags: %c%c%c%c base: %p size: %p\n", 1+i, + (ainfo_buf[i].flags & AS_AREA_READ) ? 'R' : '-', + (ainfo_buf[i].flags & AS_AREA_WRITE) ? 'W' : '-', + (ainfo_buf[i].flags & AS_AREA_EXEC) ? 'X' : '-', + (ainfo_buf[i].flags & AS_AREA_CACHEABLE) ? 'C' : '-', + ainfo_buf[i].start_addr, ainfo_buf[i].size); + + if (dump_memory) { + putchar('\n'); + area_dump(&ainfo_buf[i]); + putchar('\n'); + } + } + + putchar('\n'); + + free(ainfo_buf); + + return 0; +} + +static int thread_dump(uintptr_t thash) +{ + istate_t istate; + uintptr_t pc, fp, nfp; + stacktrace_t st; + char *sym_pc; + int rc; + + rc = udebug_regs_read(phoneid, thash, &istate); + if (rc < 0) { + printf("Failed reading registers (%d).\n", rc); + return EIO; + } + + pc = istate_get_pc(&istate); + fp = istate_get_fp(&istate); + + sym_pc = fmt_sym_address(pc); + printf("Thread %p crashed at %s. FP = %p\n", thash, sym_pc, fp); + free(sym_pc); + + st.op_arg = NULL; + st.read_uintptr = td_read_uintptr; + + while (stacktrace_fp_valid(&st, fp)) { + sym_pc = fmt_sym_address(pc); + printf(" %p: %s\n", fp, sym_pc); + free(sym_pc); + + rc = stacktrace_ra_get(&st, fp, &pc); + if (rc != EOK) + return rc; + + rc = stacktrace_fp_prev(&st, fp, &nfp); + if (rc != EOK) + return rc; + + fp = nfp; + } + + return EOK; +} + +static int area_dump(as_area_info_t *area) +{ + size_t to_copy; + size_t total; + uintptr_t addr; + int rc; + + addr = area->start_addr; + total = 0; + + while (total < area->size) { + to_copy = min(area->size - total, DBUF_SIZE); + rc = udebug_mem_read(phoneid, data_buf, addr, to_copy); + if (rc < 0) { + printf("udebug_mem_read() failed.\n"); + return rc; + } + + hex_dump(addr, data_buf, to_copy); + + addr += to_copy; + total += to_copy; + } + + return EOK; +} + +static void hex_dump(uintptr_t addr, void *buffer, size_t size) +{ + uint8_t *data = (uint8_t *) buffer; + uint8_t b; + size_t pos, i; + + assert(addr % LINE_BYTES == 0); + assert(size % LINE_BYTES == 0); + + pos = 0; + + while (pos < size) { + printf("%08lx:", addr + pos); + for (i = 0; i < LINE_BYTES; ++i) { + if (i % 4 == 0) putchar(' '); + printf(" %02x", data[pos + i]); + } + putchar('\t'); + + for (i = 0; i < LINE_BYTES; ++i) { + b = data[pos + i]; + if (b >= 32 && b < 127) { + putchar(b); + } else { + putchar(' '); + } + } + putchar('\n'); + pos += LINE_BYTES; + } +} + +static int td_read_uintptr(void *arg, uintptr_t addr, uintptr_t *value) +{ + uintptr_t data; + int rc; + + (void) arg; + + rc = udebug_mem_read(phoneid, &data, addr, sizeof(data)); + if (rc < 0) { + printf("Warning: udebug_mem_read() failed.\n"); + return rc; + } + + *value = data; + return EOK; +} + +/** Attempt to find the right executable file and load the symbol table. */ +static void autoload_syms(void) +{ + char *file_name; + int rc; + + assert(app_name != NULL); + assert(app_symtab == NULL); + + rc = asprintf(&file_name, "/app/%s", app_name); + if (rc < 0) { + printf("Memory allocation failure.\n"); + exit(1); + } + + rc = symtab_load(file_name, &app_symtab); + if (rc == EOK) { + printf("Loaded symbol table from %s\n", file_name); + free(file_name); + return; + } + + free(file_name); + + rc = asprintf(&file_name, "/srv/%s", app_name); + if (rc < 0) { + printf("Memory allocation failure.\n"); + exit(1); + } + + rc = symtab_load(file_name, &app_symtab); + if (rc == EOK) { + printf("Loaded symbol table from %s\n", file_name); + free(file_name); + return; + } + + free(file_name); + printf("Failed autoloading symbol table.\n"); +} + +static char *get_app_task_name(void) +{ + char dummy_buf; + size_t copied, needed, name_size; + char *name; + int rc; + + rc = udebug_name_read(phoneid, &dummy_buf, 0, &copied, &needed); + if (rc < 0) + return NULL; + + name_size = needed; + name = malloc(name_size + 1); + rc = udebug_name_read(phoneid, name, name_size, &copied, &needed); + if (rc < 0) { + free(name); + return NULL; + } + + assert(copied == name_size); + assert(copied == needed); + name[copied] = '\0'; + + return name; +} + +/** Format address in symbolic form. + * + * Formats address as + (
), if possible, + * otherwise as
. + * + * @param addr Address to format. + * @return Newly allocated string, address in symbolic form. + */ +static char *fmt_sym_address(uintptr_t addr) +{ + char *name; + size_t offs; + int rc; + char *str; + + if (app_symtab != NULL) { + rc = symtab_addr_to_name(app_symtab, addr, &name, &offs); + } else { + rc = ENOTSUP; + } + + if (rc == EOK) { + rc = asprintf(&str, "%p (%s+%p)", addr, name, offs); + } else { + rc = asprintf(&str, "%p", addr); + } + + if (rc < 0) { + printf("Memory allocation error.\n"); + exit(1); + } + + return str; +} + +/** @} + */ Index: uspace/app/trace/ipcp.c =================================================================== --- uspace/app/trace/ipcp.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/app/trace/ipcp.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -36,4 +36,5 @@ #include #include +#include #include "ipc_desc.h" @@ -200,8 +201,9 @@ if ((display_mask & DM_IPC) != 0) { - printf("Call ID: 0x%lx, phone: %d, proto: %s, method: ", hash, + printf("Call ID: %p, phone: %d, proto: %s, method: ", hash, phone, (proto ? proto->name : "n/a")); ipc_m_print(proto, IPC_GET_METHOD(*call)); - printf(" args: (%lu, %lu, %lu, %lu, %lu)\n", args[1], args[2], + printf(" args: (%" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG + ", %" PRIuIPCARG ", %" PRIuIPCARG ")\n", args[1], args[2], args[3], args[4], args[5]); } @@ -279,8 +281,10 @@ if ((display_mask & DM_IPC) != 0) { - printf("Response to 0x%lx: retval=%ld, args = (%lu, %lu, %lu, %lu, %lu)\n", - hash, retval, IPC_GET_ARG1(*answer), - IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer), - IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer)); + printf("Response to %p: retval=%ld, args = (%" PRIuIPCARG + ", %" PRIuIPCARG ", %" PRIuIPCARG ", %" PRIuIPCARG + ", %" PRIuIPCARG ")\n", + hash, retval, IPC_GET_ARG1(*answer), + IPC_GET_ARG2(*answer), IPC_GET_ARG3(*answer), + IPC_GET_ARG4(*answer), IPC_GET_ARG5(*answer)); } @@ -336,5 +340,5 @@ /* Not a response */ if ((display_mask & DM_IPC) != 0) { - printf("Not a response (hash 0x%lx)\n", hash); + printf("Not a response (hash %p)\n", hash); } return; Index: uspace/app/trace/trace.c =================================================================== --- uspace/app/trace/trace.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/app/trace/trace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -49,4 +49,6 @@ #include #include +#include +#include #include @@ -159,5 +161,5 @@ if (rc < 0) { printf("Error connecting\n"); - printf("ipc_connect_task(%lld) -> %d ", task_id, rc); + printf("ipc_connect_task(%" PRIdTASKID ") -> %d ", task_id, rc); return rc; } @@ -198,5 +200,5 @@ printf("Threads:"); for (i = 0; i < n_threads; i++) { - printf(" [%d] (hash 0x%lx)", 1+i, thread_hash_buf[i]); + printf(" [%d] (hash %p)", 1+i, thread_hash_buf[i]); } printf("\ntotal of %u threads\n", tb_needed / sizeof(uintptr_t)); @@ -222,5 +224,5 @@ case V_HASH: case V_PTR: - printf("0x%08lx", val); + printf("%p", val); break; @@ -275,7 +277,7 @@ putchar('('); - if (n > 0) printf("%ld", sc_args[0]); + if (n > 0) printf("%" PRIdSYSARG, sc_args[0]); for (i = 1; i < n; i++) { - printf(", %ld", sc_args[i]); + printf(", %" PRIdSYSARG, sc_args[i]); } putchar(')'); @@ -508,5 +510,5 @@ } - printf("Start tracing thread [%d] (hash 0x%lx).\n", thread_id, thread_hash); + printf("Start tracing thread [%d] (hash %p).\n", thread_id, thread_hash); while (!abort_trace) { @@ -552,5 +554,5 @@ break; case UDEBUG_EVENT_THREAD_E: - printf("Thread 0x%lx exited.\n", val0); + printf("Thread %p exited.\n", val0); fibril_mutex_lock(&state_lock); abort_trace = true; @@ -972,9 +974,9 @@ rc = connect_task(task_id); if (rc < 0) { - printf("Failed connecting to task %lld.\n", task_id); + printf("Failed connecting to task %" PRIdTASKID ".\n", task_id); return 1; } - printf("Connected to task %lld.\n", task_id); + printf("Connected to task %" PRIdTASKID ".\n", task_id); if (task_ldr != NULL) Index: uspace/lib/libc/arch/amd64/Makefile.inc =================================================================== --- uspace/lib/libc/arch/amd64/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/amd64/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -37,5 +37,6 @@ arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -fno-omit-frame-pointer Index: uspace/lib/libc/arch/amd64/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/amd64/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/amd64/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_amd64_INTTYPES_H_ +#define LIBC_amd64_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "lld" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "llo" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "llu" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "llx" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "llX" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/amd64/include/istate.h =================================================================== --- uspace/lib/libc/arch/amd64/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/amd64/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_amd64_ISTATE_H_ +#define LIBC_amd64_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint64_t rax; + uint64_t rcx; + uint64_t rdx; + uint64_t rsi; + uint64_t rdi; + uint64_t r8; + uint64_t r9; + uint64_t r10; + uint64_t r11; + uint64_t rbp; + uint64_t error_word; + uint64_t rip; + uint64_t cs; + uint64_t rflags; + uint64_t stack[]; /* Additional data on stack */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->rip; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->rbp; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/amd64/include/types.h =================================================================== --- uspace/lib/libc/arch/amd64/include/types.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/amd64/include/types.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -36,4 +36,6 @@ #define LIBC_amd64_TYPES_H_ +#define __64_BITS__ + typedef unsigned long long sysarg_t; Index: uspace/lib/libc/arch/amd64/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/amd64/src/stacktrace.S (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ (revision ) @@ -1,55 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: - movq %rbp, %rax - ret - -frame_pointer_prev: - movq (%rdi), %rax - ret - -frame_pointer_validate: - movq %rdi, %rax - ret - -return_address_get: - movq 8(%rdi), %rax - ret - -program_counter_get: - movq (%rsp), %rax - ret Index: uspace/lib/libc/arch/amd64/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/amd64/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/amd64/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcamd64 amd64 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 8 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/libc/arch/amd64/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/amd64/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/amd64/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,44 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + ret + +stacktrace_fp_get: + movq %rbp, %rax + ret + +stacktrace_pc_get: + movq (%rsp), %rax + ret Index: uspace/lib/libc/arch/arm32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/arm32/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/arm32/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -38,5 +38,6 @@ arch/$(UARCH)/src/tls.c \ arch/$(UARCH)/src/eabi.S \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -ffixed-r9 -mtp=soft -mapcs-frame -fno-omit-frame-pointer Index: uspace/lib/libc/arch/arm32/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/arm32/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/arm32/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcarm32 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_arm32_INTTYPES_H_ +#define LIBC_arm32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "X" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/include/istate.h =================================================================== --- uspace/lib/libc/arch/arm32/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/arm32/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcarm32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_arm32__ISTATE_H_ +#define LIBC_arm32__ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t spsr; + uint32_t sp; + uint32_t lr; + + uint32_t r0; + uint32_t r1; + uint32_t r2; + uint32_t r3; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + uint32_t fp; + uint32_t r12; + + uint32_t pc; +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->pc; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->fp; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/arm32/include/types.h =================================================================== --- uspace/lib/libc/arch/arm32/include/types.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/arm32/include/types.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -37,4 +37,6 @@ #define LIBC_arm32_TYPES_H_ +#define __32_BITS__ + typedef unsigned int sysarg_t; Index: uspace/lib/libc/arch/arm32/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/arm32/src/stacktrace.S (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ (revision ) @@ -1,55 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: - mov r0, fp - mov pc, lr - -frame_pointer_prev: - ldr r0, [r0, #-12] - mov pc, lr - -frame_pointer_validate: - mov pc, lr - -return_address_get: - ldr r0, [r0, #-4] - mov pc, lr - -program_counter_get: - mov r0, lr - mov pc, lr - Index: uspace/lib/libc/arch/arm32/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/arm32/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/arm32/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcarm32 arm32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV -12 +#define FRAME_OFFSET_RA -4 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/libc/arch/arm32/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/arm32/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/arm32/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,44 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + mov pc, lr + +stacktrace_fp_get: + mov r0, fp + mov pc, lr + +stacktrace_pc_get: + mov r0, lr + mov pc, lr Index: uspace/lib/libc/arch/ia32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/ia32/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/ia32/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -38,5 +38,6 @@ arch/$(UARCH)/src/tls.c \ arch/$(UARCH)/src/setjmp.S \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -march=pentium Index: uspace/lib/libc/arch/ia32/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/ia32/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ia32/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_ia32_INTTYPES_H_ +#define LIBC_ia32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "X" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia32/include/istate.h =================================================================== --- uspace/lib/libc/arch/ia32/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ia32/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup debug + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia32__ISTATE_H_ +#define LIBC_ia32__ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t eax; + uint32_t ecx; + uint32_t edx; + uint32_t ebp; + + uint32_t gs; + uint32_t fs; + uint32_t es; + uint32_t ds; + + uint32_t error_word; + uint32_t eip; + uint32_t cs; + uint32_t eflags; + uint32_t stack[]; +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->eip; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->ebp; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia32/include/types.h =================================================================== --- uspace/lib/libc/arch/ia32/include/types.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/ia32/include/types.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -36,4 +36,6 @@ #define LIBC_ia32_TYPES_H_ +#define __32_BITS__ + typedef unsigned int sysarg_t; Index: uspace/lib/libc/arch/ia32/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/ia32/src/stacktrace.S (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ (revision ) @@ -1,57 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: - movl %ebp, %eax - ret - -frame_pointer_prev: - movl 4(%esp), %eax - movl (%eax), %eax - ret - -frame_pointer_validate: - movl 4(%esp), %eax - ret - -return_address_get: - movl 4(%esp), %eax - movl 4(%eax), %eax - ret - -program_counter_get: - movl (%esp), %eax - ret Index: uspace/lib/libc/arch/ia32/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/ia32/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ia32/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia32 ia32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 4 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/libc/arch/ia32/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/ia32/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ia32/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,44 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + ret + +stacktrace_fp_get: + movl %ebp, %eax + ret + +stacktrace_pc_get: + movl (%esp), %eax + ret Index: uspace/lib/libc/arch/ia64/Makefile.inc =================================================================== --- uspace/lib/libc/arch/ia64/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/ia64/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -37,5 +37,6 @@ arch/$(UARCH)/src/tls.c \ arch/$(UARCH)/src/ddi.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -fno-unwind-tables Index: uspace/lib/libc/arch/ia64/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/ia64/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ia64/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libia64 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_ia64_INTTYPES_H_ +#define LIBC_ia64_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "ld" +#define PRIdPTR "ld" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "lo" +#define PRIoPTR "lo" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "lu" +#define PRIuPTR "lu" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "lx" +#define PRIxPTR "lx" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "lX" +#define PRIXPTR "lX" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/include/istate.h =================================================================== --- uspace/lib/libc/arch/ia64/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ia64/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ia64_ISTATE_H_ +#define LIBC_ia64_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + /* TODO */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + /* TODO */ + return 0; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* TODO */ + return 0; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ia64/include/types.h =================================================================== --- uspace/lib/libc/arch/ia64/include/types.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/ia64/include/types.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -36,4 +36,6 @@ #define LIBC_ia64_TYPES_H_ +#define __64_BITS__ + typedef unsigned long long sysarg_t; Index: uspace/lib/libc/arch/ia64/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/ia64/src/stacktrace.S (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ (revision ) @@ -1,43 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: -frame_pointer_prev: -frame_pointer_validate: -return_address_get: -program_counter_get: - mov r8 = r0 - br.ret.sptk.many b0 Index: uspace/lib/libc/arch/ia64/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/ia64/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ia64/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcia64 ia64 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include +#include + +#include + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; (void) fp; + return false; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + (void) st; (void) fp; (void) prev; + return ENOTSUP; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + (void) st; (void) fp; (void) ra; + return ENOTSUP; +} + +/** @} + */ Index: uspace/lib/libc/arch/ia64/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/ia64/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ia64/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,41 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + br.ret.sptk.many b0 + +stacktrace_fp_get: +stacktrace_pc_get: + mov r8 = r0 + br.ret.sptk.many b0 Index: uspace/lib/libc/arch/mips32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/mips32/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/mips32/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -36,5 +36,6 @@ arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -mips3 Index: uspace/lib/libc/arch/mips32/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/mips32/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/mips32/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips32 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_mips32_INTTYPES_H_ +#define LIBC_mips32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "x" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32/include/istate.h =================================================================== --- uspace/lib/libc/arch/mips32/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/mips32/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips32__ISTATE_H_ +#define LIBC_mips32__ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t at; + uint32_t v0; + uint32_t v1; + uint32_t a0; + uint32_t a1; + uint32_t a2; + uint32_t a3; + uint32_t t0; + uint32_t t1; + uint32_t t2; + uint32_t t3; + uint32_t t4; + uint32_t t5; + uint32_t t6; + uint32_t t7; + uint32_t t8; + uint32_t t9; + uint32_t gp; + uint32_t sp; + uint32_t ra; + + uint32_t lo; + uint32_t hi; + + uint32_t status; /* cp0_status */ + uint32_t epc; /* cp0_epc */ + uint32_t k1; /* We use it as thread-local pointer */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->epc; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* TODO */ + return 0; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/mips32/include/types.h =================================================================== --- uspace/lib/libc/arch/mips32/include/types.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/mips32/include/types.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -37,4 +37,6 @@ #define LIBC_mips32_TYPES_H_ +#define __32_BITS__ + typedef unsigned int sysarg_t; Index: uspace/lib/libc/arch/mips32/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/mips32/src/stacktrace.S (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ (revision ) @@ -1,46 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -.set noat -.set noreorder - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: -frame_pointer_prev: -frame_pointer_validate: -return_address_get: -program_counter_get: - j $ra - xor $v0, $v0 Index: uspace/lib/libc/arch/mips32/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/mips32/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/mips32/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcmips32 mips32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include +#include + +#include + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; (void) fp; + return false; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + (void) st; (void) fp; (void) prev; + return ENOTSUP; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + (void) st; (void) fp; (void) ra; + return ENOTSUP; +} + +/** @} + */ Index: uspace/lib/libc/arch/mips32/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/mips32/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/mips32/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,42 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +.set noat +.set noreorder + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: +stacktrace_fp_get: +stacktrace_pc_get: + j $ra + xor $v0, $v0 Index: uspace/lib/libc/arch/mips32eb/Makefile.inc =================================================================== --- uspace/lib/libc/arch/mips32eb/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/mips32eb/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -36,5 +36,6 @@ arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -mips3 Index: uspace/lib/libc/arch/mips32eb/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/mips32eb/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,1 @@ +../../mips32/include/inttypes.h Index: uspace/lib/libc/arch/mips32eb/include/istate.h =================================================================== --- uspace/lib/libc/arch/mips32eb/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/mips32eb/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,1 @@ +../../mips32/include/istate.h Index: uspace/lib/libc/arch/ppc32/Makefile.inc =================================================================== --- uspace/lib/libc/arch/ppc32/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/ppc32/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -36,5 +36,6 @@ arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -mcpu=powerpc -msoft-float -m32 Index: uspace/lib/libc/arch/ppc32/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ppc32/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcppc32 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_ppc32_INTTYPES_H_ +#define LIBC_ppc32_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "d" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "o" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "u" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "x" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "X" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/include/istate.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ppc32/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcppc32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_ppc32_ISTATE_H_ +#define LIBC_ppc32_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + uint32_t r0; + uint32_t r2; + uint32_t r3; + uint32_t r4; + uint32_t r5; + uint32_t r6; + uint32_t r7; + uint32_t r8; + uint32_t r9; + uint32_t r10; + uint32_t r11; + uint32_t r13; + uint32_t r14; + uint32_t r15; + uint32_t r16; + uint32_t r17; + uint32_t r18; + uint32_t r19; + uint32_t r20; + uint32_t r21; + uint32_t r22; + uint32_t r23; + uint32_t r24; + uint32_t r25; + uint32_t r26; + uint32_t r27; + uint32_t r28; + uint32_t r29; + uint32_t r30; + uint32_t r31; + uint32_t cr; + uint32_t pc; + uint32_t srr1; + uint32_t lr; + uint32_t ctr; + uint32_t xer; + uint32_t dar; + uint32_t r12; + uint32_t sp; +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->pc; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->sp; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/include/types.h =================================================================== --- uspace/lib/libc/arch/ppc32/include/types.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/ppc32/include/types.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -36,4 +36,6 @@ #define LIBC_ppc32_TYPES_H_ +#define __32_BITS__ + typedef unsigned int sysarg_t; Index: uspace/lib/libc/arch/ppc32/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/ppc32/src/stacktrace.S (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ (revision ) @@ -1,56 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -.text - -#include - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: - mr r3, sp - blr - -frame_pointer_prev: - lwz r3, 0(r3) - blr - -frame_pointer_validate: - blr - -return_address_get: - lwz r3, 4(r3) - blr - -program_counter_get: - mflr r3 - blr Index: uspace/lib/libc/arch/ppc32/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/ppc32/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ppc32/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcppc32 ppc32 + * @ingroup lc + * @{ + */ +/** @file + */ + +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 4 + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, prev); +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/libc/arch/ppc32/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/ppc32/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/ppc32/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,46 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +.text + +#include + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + blr + +stacktrace_fp_get: + mr r3, sp + blr + +stacktrace_pc_get: + mflr r3 + blr Index: uspace/lib/libc/arch/sparc64/Makefile.inc =================================================================== --- uspace/lib/libc/arch/sparc64/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/sparc64/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -35,5 +35,6 @@ ARCH_SOURCES += arch/$(UARCH)/src/fibril.S \ arch/$(UARCH)/src/tls.c \ - arch/$(UARCH)/src/stacktrace.S + arch/$(UARCH)/src/stacktrace.c \ + arch/$(UARCH)/src/stacktrace_asm.S GCC_CFLAGS += -mcpu=ultrasparc -m64 Index: uspace/lib/libc/arch/sparc64/include/inttypes.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/sparc64/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcsparc64 + * @{ + */ +/** @file Macros for format specifiers. + * + * Macros for formatting stdint types as specified in section + * 7.8.1 Macros for format specifiers of the C99 draft specification + * (ISO/IEC 9899:201x). Only some macros from the specification are + * implemented. + */ + +#ifndef LIBC_sparc64_INTTYPES_H_ +#define LIBC_sparc64_INTTYPES_H_ + +#define PRId8 "d" +#define PRId16 "d" +#define PRId32 "d" +#define PRId64 "lld" +#define PRIdPTR "lld" + +#define PRIo8 "o" +#define PRIo16 "o" +#define PRIo32 "o" +#define PRIo64 "llo" +#define PRIoPTR "llo" + +#define PRIu8 "u" +#define PRIu16 "u" +#define PRIu32 "u" +#define PRIu64 "llu" +#define PRIuPTR "llu" + +#define PRIx8 "x" +#define PRIx16 "x" +#define PRIx32 "x" +#define PRIx64 "llx" +#define PRIxPTR "llx" + +#define PRIX8 "X" +#define PRIX16 "X" +#define PRIX32 "X" +#define PRIX64 "llX" +#define PRIXPTR "llX" + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/include/istate.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/sparc64/include/istate.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libcsparc64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_sparc64_ISTATE_H_ +#define LIBC_sparc64_ISTATE_H_ + +#include + +/** Interrupt context. + * + * This is a copy of the kernel definition with which it must be kept in sync. + */ +typedef struct istate { + /* TODO */ +} istate_t; + +static inline uintptr_t istate_get_pc(istate_t *istate) +{ + /* TODO */ + return 0; +} + +static inline uintptr_t istate_get_fp(istate_t *istate) +{ + /* TODO */ + return 0; +} + +#endif + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/include/types.h =================================================================== --- uspace/lib/libc/arch/sparc64/include/types.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/arch/sparc64/include/types.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -36,4 +36,6 @@ #define LIBC_sparc64_TYPES_H_ +#define __64_BITS__ + typedef unsigned long sysarg_t; Index: uspace/lib/libc/arch/sparc64/src/stacktrace.S =================================================================== --- uspace/lib/libc/arch/sparc64/src/stacktrace.S (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ (revision ) @@ -1,71 +1,0 @@ -# -# Copyright (c) 2009 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -#include - -.text - -.global frame_pointer_get -.global frame_pointer_prev -.global frame_pointer_validate -.global return_address_get -.global program_counter_get - -frame_pointer_get: - # Add the stack bias to %sp to get the actual address. - retl - add %sp, STACK_BIAS, %o0 - -frame_pointer_prev: - save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp - # Flush all other windows to memory so that we can read their contents. - flushw - # Read the %fp from the window save area. - ldx [%i0 + 14 * 8], %i0 - # Add the stack bias to the %fp read from the window save area. - add %i0, STACK_BIAS, %i0 - ret - restore - -frame_pointer_validate: - retl - nop - -return_address_get: - save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp - # Flush all other windows to memory so that we can read their contents. - flushw - # Read the %i7 from the window save area. - ldx [%i0 + 15 * 8], %i0 - ret - restore - -program_counter_get: - retl - mov %o7, %o0 - Index: uspace/lib/libc/arch/sparc64/src/stacktrace.c =================================================================== --- uspace/lib/libc/arch/sparc64/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/sparc64/src/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2010 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup sparc64 + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +#include + +#define FRAME_OFFSET_FP_PREV (14 * 8) +#define FRAME_OFFSET_RA (15 * 8) + +bool stacktrace_fp_valid(stacktrace_t *st, uintptr_t fp) +{ + (void) st; + return fp != 0; +} + +int stacktrace_fp_prev(stacktrace_t *st, uintptr_t fp, uintptr_t *prev) +{ + uintptr_t bprev; + int rc; + + rc = (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_FP_PREV, &bprev); + if (rc == EOK) + *prev = bprev + STACK_BIAS; + return rc; +} + +int stacktrace_ra_get(stacktrace_t *st, uintptr_t fp, uintptr_t *ra) +{ + return (*st->read_uintptr)(st->op_arg, fp + FRAME_OFFSET_RA, ra); +} + +/** @} + */ Index: uspace/lib/libc/arch/sparc64/src/stacktrace_asm.S =================================================================== --- uspace/lib/libc/arch/sparc64/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/arch/sparc64/src/stacktrace_asm.S (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,51 @@ +# +# Copyright (c) 2009 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +#include + +.text + +.global stacktrace_prepare +.global stacktrace_fp_get +.global stacktrace_pc_get + +stacktrace_prepare: + save %sp, -(STACK_WINDOW_SAVE_AREA_SIZE+STACK_ARG_SAVE_AREA_SIZE), %sp + # Flush all other windows to memory so that we can read their contents. + flushw + ret + restore + +stacktrace_fp_get: + # Add the stack bias to %sp to get the actual address. + retl + add %sp, STACK_BIAS, %o0 + +stacktrace_pc_get: + retl + mov %o7, %o0 Index: uspace/lib/libc/generic/stacktrace.c =================================================================== --- uspace/lib/libc/generic/stacktrace.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/generic/stacktrace.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda * All rights reserved. * @@ -36,22 +37,40 @@ #include #include +#include -void stack_trace_fp_pc(uintptr_t fp, uintptr_t pc) +static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data); + +void stacktrace_print_fp_pc(uintptr_t fp, uintptr_t pc) { - while (frame_pointer_validate(fp)) { + stacktrace_t st; + uintptr_t nfp; + + st.op_arg = NULL; + st.read_uintptr = stacktrace_read_uintptr; + + while (stacktrace_fp_valid(&st, fp)) { printf("%p: %p()\n", fp, pc); - pc = return_address_get(fp); - fp = frame_pointer_prev(fp); + (void) stacktrace_ra_get(&st, fp, &pc); + (void) stacktrace_fp_prev(&st, fp, &nfp); + fp = nfp; } } -void stack_trace(void) +void stacktrace_print(void) { - stack_trace_fp_pc(frame_pointer_get(), program_counter_get()); + stacktrace_prepare(); + stacktrace_print_fp_pc(stacktrace_fp_get(), stacktrace_pc_get()); /* * Prevent the tail call optimization of the previous call by * making it a non-tail call. */ - (void) frame_pointer_get(); + (void) stacktrace_fp_get(); +} + +static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data) +{ + (void) arg; + *data = *((uintptr_t *) addr); + return EOK; } Index: uspace/lib/libc/generic/udebug.c =================================================================== --- uspace/lib/libc/generic/udebug.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/generic/udebug.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -69,4 +69,34 @@ } +int udebug_name_read(int phoneid, void *buffer, size_t n, + size_t *copied, size_t *needed) +{ + ipcarg_t a_copied, a_needed; + int rc; + + rc = async_req_3_3(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_NAME_READ, + (sysarg_t)buffer, n, NULL, &a_copied, &a_needed); + + *copied = (size_t)a_copied; + *needed = (size_t)a_needed; + + return rc; +} + +int udebug_areas_read(int phoneid, void *buffer, size_t n, + size_t *copied, size_t *needed) +{ + ipcarg_t a_copied, a_needed; + int rc; + + rc = async_req_3_3(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_AREAS_READ, + (sysarg_t)buffer, n, NULL, &a_copied, &a_needed); + + *copied = (size_t)a_copied; + *needed = (size_t)a_needed; + + return rc; +} + int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n) { @@ -78,4 +108,10 @@ { return async_req_3_0(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_ARGS_READ, + tid, (sysarg_t)buffer); +} + +int udebug_regs_read(int phoneid, thash_t tid, void *buffer) +{ + return async_req_3_0(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_REGS_READ, tid, (sysarg_t)buffer); } Index: uspace/lib/libc/include/inttypes.h =================================================================== --- uspace/lib/libc/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/include/inttypes.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_INTTYPES_H_ +#define LIBC_INTTYPES_H_ + +#include + +#endif + +/** @} + */ Index: uspace/lib/libc/include/stacktrace.h =================================================================== --- uspace/lib/libc/include/stacktrace.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/include/stacktrace.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -1,4 +1,5 @@ /* * Copyright (c) 2009 Jakub Jermar + * Copyright (c) 2010 Jiri Svoboda * All rights reserved. * @@ -39,15 +40,22 @@ #include -extern void stack_trace(void); -extern void stack_trace_fp_pc(uintptr_t, uintptr_t); +typedef struct { + void *op_arg; + int (*read_uintptr)(void *, uintptr_t, uintptr_t *); +} stacktrace_t; + +extern void stacktrace_print(void); +extern void stacktrace_print_fp_pc(uintptr_t, uintptr_t); /* * The following interface is to be implemented by each architecture. */ -extern bool frame_pointer_validate(uintptr_t); -extern uintptr_t frame_pointer_get(void); -extern uintptr_t frame_pointer_prev(uintptr_t); -extern uintptr_t return_address_get(uintptr_t); -extern uintptr_t program_counter_get(); +extern bool stacktrace_fp_valid(stacktrace_t *, uintptr_t); +extern int stacktrace_fp_prev(stacktrace_t *, uintptr_t, uintptr_t *); +extern int stacktrace_ra_get(stacktrace_t *, uintptr_t, uintptr_t *); + +extern void stacktrace_prepare(void); +extern uintptr_t stacktrace_fp_get(void); +extern uintptr_t stacktrace_pc_get(); #endif Index: uspace/lib/libc/include/stdlib.h =================================================================== --- uspace/lib/libc/include/stdlib.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/include/stdlib.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -42,5 +42,5 @@ #define abort() \ do { \ - stack_trace(); \ + stacktrace_print(); \ _exit(1); \ } while (0) Index: uspace/lib/libc/include/sys/typefmt.h =================================================================== --- uspace/lib/libc/include/sys/typefmt.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/lib/libc/include/sys/typefmt.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file Formatting macros for types from sys/types.h and some other + * system types. + */ + +#ifndef LIBC_SYS_TYPEFMT_H_ +#define LIBC_SYS_TYPEFMT_H_ + +#include + +/* off_t */ +#define PRIdOFF "ld" +#define PRIuOFF "lu" +#define PRIxOFF "lx" +#define PRIXOFF "lX" + +/* bn_t */ +#define PRIdBN PRId64 +#define PRIuBN PRIu64 +#define PRIxBN PRIx64 +#define PRIXBN PRIX64 + +/* (s)size_t */ +#define PRIdSIZE PRIdPTR +#define PRIuSIZE PRIuPTR +#define PRIxSIZE PRIxPTR +#define PRIXSIZE PRIXPTR + +/* sysarg_t */ +#define PRIdSYSARG PRIdPTR +#define PRIuSYSARG PRIuPTR +#define PRIxSYSARG PRIxPTR +#define PRIXSYSARG PRIxPTR + +/* ipcarg_t */ +#define PRIdIPCARG PRIdPTR +#define PRIuIPCARG PRIuPTR +#define PRIxIPCARG PRIxPTR +#define PRIXIPCARG PRIXPTR + +/* taskid_t */ +#define PRIdTASKID PRId64 +#define PRIuTASKID PRIu64 +#define PRIxTASKID PRIx64 +#define PRIXTASKID PRIx64 + +#endif + +/** @} + */ Index: uspace/lib/libc/include/udebug.h =================================================================== --- uspace/lib/libc/include/udebug.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/lib/libc/include/udebug.h (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -47,6 +47,11 @@ int udebug_thread_read(int phoneid, void *buffer, size_t n, size_t *copied, size_t *needed); +int udebug_name_read(int phoneid, void *buffer, size_t n, + size_t *copied, size_t *needed); +int udebug_areas_read(int phoneid, void *buffer, size_t n, + size_t *copied, size_t *needed); int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n); int udebug_args_read(int phoneid, thash_t tid, sysarg_t *buffer); +int udebug_regs_read(int phoneid, thash_t tid, void *buffer); int udebug_go(int phoneid, thash_t tid, udebug_event_t *ev_type, sysarg_t *val0, sysarg_t *val1); Index: uspace/lib/libpci/Makefile.build =================================================================== --- uspace/lib/libpci/Makefile.build (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ (revision ) @@ -1,64 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -## Setup toolchain -# - -include Makefile.common -include $(LIBC_PREFIX)/Makefile.toolchain - -## Sources -# - -SOURCES = \ - access.c \ - generic.c \ - names.c \ - i386-ports.c - -OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) - -.PHONY: all - -all: $(LIBPCI) - --include $(DEPEND) - -$(LIBPCI): $(OBJECTS) - $(AR) rc $@ $(OBJECTS) - -%.o: %.c $(DEPEND) - $(CC) $(DEFS) $(CFLAGS) -c $< -o $@ -ifeq ($(PRECHECK),y) - $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) -endif - -$(DEPEND): - makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null - -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ Index: uspace/lib/libpci/Makefile.common =================================================================== --- uspace/lib/libpci/Makefile.common (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ (revision ) @@ -1,37 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - - -## Common names -# - -LIBC_PREFIX = ../../../../../lib/libc -DEPEND = Makefile.depend -DEPEND_PREV = $(DEPEND).prev -JOB = libpci.job -LIBPCI = libpci.a Index: uspace/srv/bd/ata_bd/ata_bd.c =================================================================== --- uspace/srv/bd/ata_bd/ata_bd.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/bd/ata_bd/ata_bd.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -59,4 +59,5 @@ #include #include +#include #include #include @@ -112,5 +113,5 @@ printf(NAME ": ATA disk driver\n"); - printf("I/O address 0x%p/0x%p\n", ctl_physical, cmd_physical); + printf("I/O address %p/%p\n", ctl_physical, cmd_physical); if (ata_bd_init() != EOK) @@ -180,9 +181,9 @@ } - printf(" %llu blocks", d->blocks, d->blocks / (2 * 1024)); + printf(" %" PRIu64 " blocks", d->blocks, d->blocks / (2 * 1024)); mbytes = d->blocks / (2 * 1024); if (mbytes > 0) - printf(" %llu MB.", mbytes); + printf(" %" PRIu64 " MB.", mbytes); printf("\n"); Index: uspace/srv/bd/part/guid_part/guid_part.c =================================================================== --- uspace/srv/bd/part/guid_part/guid_part.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/bd/part/guid_part/guid_part.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -54,4 +54,6 @@ #include #include +#include +#include #include #include @@ -196,6 +198,6 @@ size_mb = (part->length * block_size + 1024 * 1024 - 1) / (1024 * 1024); - printf(NAME ": Registered device %s: %llu blocks %llu MB.\n", - name, part->length, size_mb); + printf(NAME ": Registered device %s: %" PRIu64 " blocks " + "%" PRIuBN " MB.\n", name, part->length, size_mb); part->dev = dev; Index: uspace/srv/bd/part/mbr_part/mbr_part.c =================================================================== --- uspace/srv/bd/part/mbr_part/mbr_part.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/bd/part/mbr_part/mbr_part.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -64,4 +64,6 @@ #include #include +#include +#include #include #include @@ -247,6 +249,6 @@ size_mb = (part->length * block_size + 1024 * 1024 - 1) / (1024 * 1024); - printf(NAME ": Registered device %s: %llu blocks %llu MB.\n", - name, part->length, size_mb); + printf(NAME ": Registered device %s: %" PRIuBN " blocks " + "%" PRIu64 " MB.\n", name, part->length, size_mb); part->dev = dev; @@ -274,5 +276,5 @@ if (brb == NULL) { printf(NAME ": Failed allocating memory.\n"); - return ENOMEM; + return ENOMEM; } @@ -289,5 +291,6 @@ sgn = uint16_t_le2host(brb->signature); if (sgn != BR_SIGNATURE) { - printf(NAME ": Invalid boot record signature 0x%04X.\n", sgn); + printf(NAME ": Invalid boot record signature 0x%04" PRIX16 + ".\n", sgn); return EINVAL; } @@ -333,5 +336,6 @@ rc = block_read_direct(indev_handle, ba, 1, brb); if (rc != EOK) { - printf(NAME ": Failed reading EBR block at %u.\n", ba); + printf(NAME ": Failed reading EBR block at %" + PRIu32 ".\n", ba); return rc; } @@ -339,6 +343,6 @@ sgn = uint16_t_le2host(brb->signature); if (sgn != BR_SIGNATURE) { - printf(NAME ": Invalid boot record signature 0x%04X " - " in EBR at %u.\n", sgn, ba); + printf(NAME ": Invalid boot record signature 0x%04" + PRIX16 " in EBR at %" PRIu32 ".\n", sgn, ba); return EINVAL; } Index: uspace/srv/hid/kbd/port/i8042.h =================================================================== --- uspace/srv/hid/kbd/port/i8042.h (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ (revision ) @@ -1,55 +1,0 @@ -/* - * Copyright (c) 2006 Josef Cejka - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup kbd_port - * @ingroup kbd - * @{ - */ - -/** @file - * @brief i8042 port driver. - */ - -#ifndef KBD_PORT_i8042_H_ -#define KBD_PORT_i8042_H_ - -#include -#include - -struct i8042 { - ioport8_t data; - uint8_t pad[3]; - ioport8_t status; -} __attribute__ ((packed)); -typedef struct i8042 i8042_t; - -#endif - -/** - * @} - */ Index: uspace/srv/loader/arch/amd64/Makefile.inc =================================================================== --- uspace/srv/loader/arch/amd64/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/loader/arch/amd64/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__64_BITS__ ARCH_SOURCES := arch/$(UARCH)/amd64.s Index: uspace/srv/loader/arch/arm32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/arm32/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/loader/arch/arm32/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__32_BITS__ ARCH_SOURCES := arch/$(UARCH)/arm32.s Index: uspace/srv/loader/arch/ia32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/ia32/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/loader/arch/ia32/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__32_BITS__ ARCH_SOURCES := arch/$(UARCH)/ia32.s Index: uspace/srv/loader/arch/ia64/Makefile.inc =================================================================== --- uspace/srv/loader/arch/ia64/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/loader/arch/ia64/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -27,5 +27,4 @@ # -EXTRA_CFLAGS = -D__64_BITS__ ARCH_SOURCES := arch/$(UARCH)/ia64.s AFLAGS += -xexplicit Index: uspace/srv/loader/arch/mips32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/mips32/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/loader/arch/mips32/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__32_BITS__ ARCH_SOURCES := arch/$(UARCH)/mips32.s Index: uspace/srv/loader/arch/ppc32/Makefile.inc =================================================================== --- uspace/srv/loader/arch/ppc32/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/loader/arch/ppc32/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__32_BITS__ ARCH_SOURCES := arch/$(UARCH)/ppc32.s Index: uspace/srv/loader/arch/sparc64/Makefile.inc =================================================================== --- uspace/srv/loader/arch/sparc64/Makefile.inc (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/loader/arch/sparc64/Makefile.inc (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -27,4 +27,3 @@ # -EXTRA_CFLAGS = -D__64_BITS__ ARCH_SOURCES := arch/$(UARCH)/sparc64.s Index: uspace/srv/loader/elf_load.c =================================================================== --- uspace/srv/loader/elf_load.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/loader/elf_load.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -342,6 +342,6 @@ seg_ptr = (void *) seg_addr; - DPRINTF("Load segment at addr 0x%x, size 0x%x\n", seg_addr, - entry->p_memsz); + DPRINTF("Load segment at addr %p, size 0x%x\n", seg_addr, + entry->p_memsz); if (entry->p_align > 1) { @@ -370,5 +370,5 @@ mem_sz = entry->p_memsz + (entry->p_vaddr - base); - DPRINTF("Map to seg_addr=0x%x-0x%x.\n", seg_addr, + DPRINTF("Map to seg_addr=%p-%p.\n", seg_addr, entry->p_vaddr + bias + ALIGN_UP(entry->p_memsz, PAGE_SIZE)); @@ -384,5 +384,5 @@ } - DPRINTF("as_area_create(0x%lx, 0x%x, %d) -> 0x%lx\n", + DPRINTF("as_area_create(%p, 0x%x, %d) -> 0x%lx\n", base + bias, mem_sz, flags, (uintptr_t)a); @@ -461,5 +461,5 @@ elf->info->dynamic = (void *)((uint8_t *)entry->sh_addr + elf->bias); - DPRINTF("Dynamic section found at 0x%x.\n", + DPRINTF("Dynamic section found at %p.\n", (uintptr_t)elf->info->dynamic); break; Index: uspace/srv/loader/main.c =================================================================== --- uspace/srv/loader/main.c (revision 7efc5177d0833414fcb6f7e2ce27f3efd24ce05d) +++ uspace/srv/loader/main.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -392,5 +392,5 @@ /* Dynamically linked program */ DPRINTF("Run ELF interpreter.\n"); - DPRINTF("Entry point: 0x%lx\n", interp_info.entry); + DPRINTF("Entry point: %p\n", interp_info.entry); ipc_answer_0(rid, EOK); Index: uspace/srv/taskmon/Makefile =================================================================== --- uspace/srv/taskmon/Makefile (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/srv/taskmon/Makefile (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,37 @@ +# +# Copyright (c) 2010 Jiri Svoboda +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../.. +LIBS = $(LIBC_PREFIX)/libc.a + +OUTPUT = taskmon + +SOURCES = \ + taskmon.c + +include ../Makefile.common Index: uspace/srv/taskmon/taskmon.c =================================================================== --- uspace/srv/taskmon/taskmon.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) +++ uspace/srv/taskmon/taskmon.c (revision 89ee7ffcc1cadaf04c540cd8bfc290aac1e6d4d5) @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup taskmon + * @brief + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define NAME "taskmon" + +static void fault_event(ipc_callid_t callid, ipc_call_t *call) +{ + char *argv[11]; + char *fname; + char *dump_fname; + char *s_taskid; + char **s; + + task_id_t taskid; + uintptr_t thread; + + taskid = MERGE_LOUP32(IPC_GET_ARG1(*call), IPC_GET_ARG2(*call)); + thread = IPC_GET_ARG3(*call); + + if (asprintf(&s_taskid, "%" PRIuTASKID, taskid) < 0) { + printf("Memory allocation failed.\n"); + return; + } + + if (asprintf(&dump_fname, "/scratch/d" PRIuTASKID ".txt", taskid) < 0) { + printf("Memory allocation failed.\n"); + return; + } + + printf(NAME ": Task %" PRIuTASKID " fault in thread %p.\n", taskid, thread); + +#ifdef CONFIG_VERBOSE_DUMPS + argv[0] = "/app/redir"; + argv[1] = "-i"; + argv[2] = "/readme"; + argv[3] = "-o"; + argv[4] = dump_fname; + argv[5] = "--"; + argv[6] = "/app/taskdump"; + argv[7] = "-m"; + argv[8] = "-t"; + argv[9] = s_taskid; + argv[10] = NULL; +#else + argv[0] = "/app/taskdump"; + argv[1] = "-t"; + argv[2] = s_taskid; + argv[3] = NULL; +#endif + fname = argv[0]; + + printf(NAME ": Executing"); + s = argv; + while (*s != NULL) { + printf(" %s", *s); + ++s; + } + putchar('\n'); + + if (!task_spawn(fname, argv)) + printf(NAME ": Error spawning taskdump.\n", fname); +} + +int main(int argc, char *argv[]) +{ + printf(NAME ": Task Monitoring Service\n"); + + if (event_subscribe(EVENT_FAULT, 0) != EOK) { + printf(NAME ": Error registering fault notifications.\n"); + return -1; + } + + async_set_interrupt_received(fault_event); + async_manager(); + + return 0; +} + +/** @} + */