Merge/backport John Franklin patches into test

u3e_fault fixes and extra printf
Makefile and doc changes (from master)
This commit is contained in:
Raymond Pasco 2015-10-19 13:08:36 -04:00
commit 13ca59eeb5
3 changed files with 35 additions and 2 deletions

View File

@ -145,6 +145,30 @@ Just do the same procedure to create a new, merged pill before
committing the merge. Otherwise, just make sure to use the correct
`urbit.pill` for each commit.
## Debug urbit with `gdb`
Follow the build instructions in README.md but run `make` with argument `DEBUG=yes`:
(If you've already built urbit first run `make clean`.)
make DEBUG=yes
Run `gdb`, while loading `bin/urbit` and its symbol table:
gdb bin/urbit
Set a breakpoint on `main()` (optional):
break main
Run your urbit comet `mycomet`:
run mycomet
Continue from the breakpoint on `main()`:
continue
## What to work on
If you are not thinking of contributing with a specific goal in mind,

View File

@ -70,10 +70,18 @@ endif
INCLUDE=include
MDEFINES=-DU3_OS_$(OS) -DU3_OS_ENDIAN_$(ENDIAN) -D U3_LIB=\"$(LIB)\"
DEBUG=no
ifeq ($(DEBUG),yes)
DEBUGFLAGS=-g
else
DEBUGFLAGS=-O3
endif
# NOTFORCHECKIN - restore -O3
# -DGHETTO \
# -DHUSH
CFLAGS= $(COSFLAGS) -O3 -ffast-math \
CFLAGS= $(COSFLAGS) $(DEBUGFLAGS) -ffast-math \
-funsigned-char \
-I/usr/local/include \
-I/opt/local/include \

View File

@ -115,8 +115,9 @@ u3e_fault(void* adr_v, c3_i ser_i)
{
c3_w* adr_w = (c3_w*) adr_v;
if ( (adr_w < u3_Loom) || (adr_w > (u3_Loom + u3a_words)) ) {
if ( (adr_w < u3_Loom) || (adr_w >= (u3_Loom + u3a_words)) ) {
fprintf(stderr, "address %p out of loom!\r\n", adr_v);
fprintf(stderr, "loom: [%p : %p)\r\n", u3_Loom, u3_Loom + u3a_words);
c3_assert(0);
return 0;
}