| /branches/tracing/kernel/arch/amd64/include/interrupt.h |
|---|
| 62,6 → 62,7 |
| #endif |
| #define VECTOR_DEBUG 1 |
| #define VECTOR_BREAKPOINT 3 |
| #define VECTOR_CLK (IVT_IRQBASE + IRQ_CLK) |
| #define VECTOR_PIC_SPUR (IVT_IRQBASE + IRQ_PIC_SPUR) |
| #define VECTOR_SYSCALL IVT_FREEBASE |
| 96,7 → 97,7 |
| { |
| istate->rip = retaddr; |
| } |
| static inline unative_t istate_get_pc(istate_t *istate) |
| static inline uintptr_t istate_get_pc(istate_t *istate) |
| { |
| return istate->rip; |
| } |
| /branches/tracing/kernel/arch/amd64/include/breakpoint.h |
|---|
| 0,0 → 1,43 |
| /* |
| * 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 amd64 |
| * @{ |
| */ |
| /** @file |
| */ |
| #ifndef KERN_amd64_BREAKPOINT_H_ |
| #define KERN_amd64_BREAKPOINT_H_ |
| extern void breakpoint_init(void); |
| #endif |
| /** @} |
| */ |
| /branches/tracing/kernel/arch/amd64/Makefile.inc |
|---|
| 88,3 → 88,8 |
| arch/$(KARCH)/src/smp/mps.c \ |
| arch/$(KARCH)/src/smp/smp.c |
| endif |
| ifeq ($(CONFIG_UDEBUG),y) |
| ARCH_SOURCES += \ |
| arch/$(KARCH)/src/breakpoint.c |
| endif |
| /branches/tracing/kernel/arch/amd64/src/breakpoint.c |
|---|
| 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 amd64 |
| * @{ |
| */ |
| /** @file |
| */ |
| #include <arch/breakpoint.h> |
| #include <panic.h> |
| #include <print.h> |
| #include <interrupt.h> |
| #include <func.h> |
| static void breakpoint_exception(int n __attribute__((unused)), istate_t *istate) |
| { |
| ASSERT(THREAD); |
| ASSERT(istate_from_uspace(istate)); |
| (void)istate; |
| printf("breakpoint exception\n"); |
| udebug_breakpoint_event(istate_get_pc(istate)); |
| } |
| /** Initialize breakpoint handling */ |
| void breakpoint_init() |
| { |
| exc_register(VECTOR_BREAKPOINT, "breakpoint", |
| breakpoint_exception); |
| } |
| /** @} |
| */ |
| /branches/tracing/kernel/arch/amd64/src/amd64.c |
|---|
| 62,6 → 62,7 |
| #include <interrupt.h> |
| #include <arch/syscall.h> |
| #include <arch/debugger.h> |
| #include <arch/breakpoint.h> |
| #include <syscall/syscall.h> |
| #include <console/console.h> |
| #include <ddi/irq.h> |
| 163,6 → 164,10 |
| /* Enable debugger */ |
| debugger_init(); |
| //#ifdef CONFIG_UDEBUG |
| /* Enable INT3 breakpoint handler */ |
| breakpoint_init(); |
| //#endif |
| /* Merge all memory zones to 1 big zone */ |
| zone_merge_all(); |
| } |
| /branches/tracing/kernel/arch/ia32/include/breakpoint.h |
|---|
| File deleted |
| /branches/tracing/kernel/arch/ia32/src/breakpoint.c |
|---|
| 1,59 → 1,0 |
| /* |
| * 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 ia32 |
| * @{ |
| */ |
| /** @file |
| */ |
| #include <arch/breakpoint.h> |
| #include <panic.h> |
| #include <print.h> |
| #include <interrupt.h> |
| #include <func.h> |
| static void breakpoint_exception(int n __attribute__((unused)), istate_t *istate) |
| { |
| ASSERT(THREAD); |
| ASSERT(istate_from_uspace(istate)); |
| (void)istate; |
| printf("breakpoint exception\n"); |
| udebug_breakpoint_event(istate->eip); |
| } |
| /** Initialize breakpoint handling */ |
| void breakpoint_init() |
| { |
| exc_register(VECTOR_BREAKPOINT, "breakpoint", |
| breakpoint_exception); |
| } |
| /** @} |
| */ |
| link ../../amd64/src/breakpoint.c |
| Property changes: |
| Added: svn:special |
| +* |
| \ No newline at end of property |