mirror
/
stlink
kopia lustrzana https://github.com/stlink-org/stlink
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'master' of github.com:karlp/stlink

pull/29/head
Karl Palsson 2011-11-11 22:59:44 +00:00
rodzic c98c487fa5 e9a205ff98
commit 6cc3375151
3 zmienionych plików z 12 dodań i 46 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
flash/Makefile
Wyświetl plik

@ -1,10 +1,3 @@
# make ... for both libusb and libsg
#
# make CONFIG_USE_LIBSG=0 ...
# for just libusb
#
CC=gcc
CFLAGS+=-g CFLAGS+=-g
CFLAGS+=-DCONFIG_USE_LIBUSB=1 CFLAGS+=-DCONFIG_USE_LIBUSB=1
CFLAGS+=-DDEBUG CFLAGS+=-DDEBUG
@ -14,15 +7,6 @@ CFLAGS+=-I../src
LDFLAGS=-L.. -lstlink -lusb-1.0 LDFLAGS=-L.. -lstlink -lusb-1.0
ifeq ($(CONFIG_USE_LIBSG),)
CONFIG_USE_LIBSG=1
endif
ifneq ($(CONFIG_USE_LIBSG),0)
CFLAGS+=-DCONFIG_USE_LIBSG=1
LDFLAGS+=-lsgutils2
endif
SRCS=main.c SRCS=main.c
OBJS=$(SRCS:.c=.o) OBJS=$(SRCS:.c=.o)

15
gdbserver/Makefile
Wyświetl plik

@ -1,9 +1,3 @@
# make ... for both libusb and libsg
#
# make CONFIG_USE_LIBSG=0 ...
# for just libusb
#
PRG := st-util PRG := st-util
OBJS = gdb-remote.o gdb-server.o OBJS = gdb-remote.o gdb-server.o
@ -11,15 +5,6 @@ CFLAGS+=-g -Wall -Werror -std=gnu99 -I../src
CFLAGS+=-DCONFIG_USE_LIBUSB=1 CFLAGS+=-DCONFIG_USE_LIBUSB=1
LDFLAGS=-L.. -lstlink -lusb-1.0 LDFLAGS=-L.. -lstlink -lusb-1.0
ifeq ($(CONFIG_USE_LIBSG),)
CONFIG_USE_LIBSG=1
endif
ifneq ($(CONFIG_USE_LIBSG),0)
CFLAGS+=-DCONFIG_USE_LIBSG=1
LDFLAGS+=-lsgutils2
endif
all: $(PRG) all: $(PRG)
$(PRG): $(OBJS) $(PRG): $(OBJS)

27
src/stlink-sg.c
Wyświetl plik

@ -707,9 +707,6 @@ void _stlink_sg_force_debug(stlink_t *sl) {
void _stlink_sg_read_all_regs(stlink_t *sl, reg *regp) { void _stlink_sg_read_all_regs(stlink_t *sl, reg *regp) {
struct stlink_libsg *sg = sl->backend_data; struct stlink_libsg *sg = sl->backend_data;
/* unused */
regp = regp;
clear_cdb(sg); clear_cdb(sg);
sg->cdb_cmd_blk[1] = STLINK_DEBUG_READALLREGS; sg->cdb_cmd_blk[1] = STLINK_DEBUG_READALLREGS;
sl->q_len = 84; sl->q_len = 84;
@ -722,23 +719,23 @@ void _stlink_sg_read_all_regs(stlink_t *sl, reg *regp) {
// 0-3 | 4-7 | ... | 60-63 | 64-67 | 68-71 | 72-75 | 76-79 | 80-83 // 0-3 | 4-7 | ... | 60-63 | 64-67 | 68-71 | 72-75 | 76-79 | 80-83
// r0 | r1 | ... | r15 | xpsr | main_sp | process_sp | rw | rw2 // r0 | r1 | ... | r15 | xpsr | main_sp | process_sp | rw | rw2
for (int i = 0; i < 16; i++) { for (int i = 0; i < 16; i++) {
sg->reg.r[i] = read_uint32(sl->q_buf, 4 * i); regp->r[i] = read_uint32(sl->q_buf, 4 * i);
if (sl->verbose > 1) if (sl->verbose > 1)
DLOG("r%2d = 0x%08x\n", i, sg->reg.r[i]); DLOG("r%2d = 0x%08x\n", i, regp->r[i]);
} }
sg->reg.xpsr = read_uint32(sl->q_buf, 64); regp->xpsr = read_uint32(sl->q_buf, 64);
sg->reg.main_sp = read_uint32(sl->q_buf, 68); regp->main_sp = read_uint32(sl->q_buf, 68);
sg->reg.process_sp = read_uint32(sl->q_buf, 72); regp->process_sp = read_uint32(sl->q_buf, 72);
sg->reg.rw = read_uint32(sl->q_buf, 76); regp->rw = read_uint32(sl->q_buf, 76);
sg->reg.rw2 = read_uint32(sl->q_buf, 80); regp->rw2 = read_uint32(sl->q_buf, 80);
if (sl->verbose < 2) if (sl->verbose < 2)
return; return;
DLOG("xpsr = 0x%08x\n", sg->reg.xpsr); DLOG("xpsr = 0x%08x\n", regp->xpsr);
DLOG("main_sp = 0x%08x\n", sg->reg.main_sp); DLOG("main_sp = 0x%08x\n", regp->main_sp);
DLOG("process_sp = 0x%08x\n", sg->reg.process_sp); DLOG("process_sp = 0x%08x\n", regp->process_sp);
DLOG("rw = 0x%08x\n", sg->reg.rw); DLOG("rw = 0x%08x\n", regp->rw);
DLOG("rw2 = 0x%08x\n", sg->reg.rw2); DLOG("rw2 = 0x%08x\n", regp->rw2);
} }
// Read an arm-core register, the index must be in the range 0..20. // Read an arm-core register, the index must be in the range 0..20.