Skip to content

small change to _bspExtCatchBreakpoint as EXC_DAR was unused in the new exception frame #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hjunkes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

small change to _bspExtCatchBreakpoint as EXC_DAR was unused in the new exception frame #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
include $(RTEMS_MAKEFILE_PATH)/Makefile.inc

include $(RTEMS_CUSTOM)
include $(RTEMS_ROOT)/make/lib.cfg
include $(RTEMS_SHARE_PATH)/make/lib.cfg

ifneq ($(filter $(RTEMS_CPU),i386 powerpc)xx,xx)
# this CPU is supported
Expand All @@ -42,10 +42,11 @@ ifneq ($(filter $(RTEMS_CPU),i386 powerpc)xx,xx)
# Add local stuff here using +=
#

DEFINES +=
DEFINES += -Dmpc7455
CPPFLAGS +=
# inline declarations require -O
CFLAGS += -Winline
CFLAGS += -I/home/rtems/RTEMS/rtems-4.12/powerpc-rtems4.12/beatnik/lib/include

#
# Add your list of files to delete here. The config files
Expand Down
4 changes: 4 additions & 0 deletions bspExt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
#include <rtems.h>
#include <bsp.h>

/* for SPR register aliases */
#include <rtems/powerpc/registers.h>
#include <libcpu/spr.h>

/* Macro to detect RTEMS version */
#include <rtems/system.h>

Expand Down
5 changes: 3 additions & 2 deletions dabrBpnt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ bspExtRemoveBreakpoint(void *addr)
#define PHASE(cause) ((cause)&2)
#define TYPE(cause) ((cause)&1)

SPR_RO(PPC_DAR)

int
_bspExtCatchBreakpoint(BSP_Exception_frame *fp)
Expand All @@ -216,8 +217,8 @@ int cause = -1;
/* check for catch condition */
if ( 3==fp->_EXC_number &&
(BPNTS[DBPNT].mode & DABR_MODE_COARSE ?
!(((long)BPNTS[DBPNT].addr ^ (long)fp->EXC_DAR) & ~DABR_FLGS) :
(long)BPNTS[DBPNT].addr == (long)fp->EXC_DAR
!(((long)BPNTS[DBPNT].addr ^ (long)_read_PPC_DAR) & ~DABR_FLGS) :
(long)BPNTS[DBPNT].addr == (long)_read_PPC_DAR
) )
cause = CAUSE_DABR_PHASE1;
else if ( 0x13 == fp->_EXC_number &&
Expand Down