URL
https://opencores.org/ocsvn/openarty/openarty/trunk
Subversion Repositories openarty
Compare Revisions
- This comparison shows the changes necessary to convert path
/openarty/trunk/sw/host
- from Rev 33 to Rev 34
- ↔ Reverse comparison
Rev 33 → Rev 34
/Makefile
39,7 → 39,7
.PHONY: all |
PROGRAMS := wbregs netuart wbsettime dumpflash wbprogram netsetup manping zipload zipstate zipdbg |
SCOPES := eqspiscope etxscope erxscope cpuscope |
all: $(PROGRAMS) $(SCOPES) |
all: $(PROGRAMS) $(SCOPES) gps |
CXX := g++ |
OBJDIR := obj-pc |
BUSOBJS := $(OBJDIR)/ttybus.o $(OBJDIR)/llcomms.o $(OBJDIR)/regdefs.o |
58,6 → 58,10
$(OBJDIR)/%.o: %.cpp |
$(CXX) -g -c $< -o $@ |
|
.PHONY: gps |
gps: $(BUSOBJS) $(OBJDIR)/scopecls.o |
@bash -c "if [[ -e gps/Makefile ]]; then cd gps; make --no-print-directory; fi" |
|
$(OBJDIR)/hsnetuart.o: netuart.cpp |
$(CXX) -g -c -DHIGH_SPEED $< -o $@ |
|
73,6 → 77,9
$(CXX) -g $^ -o $@ |
hsnetuart: $(OBJDIR)/hsnetuart.o |
$(CXX) -g $^ -o $@ |
# |
# Some simple programs that just depend upon the ability to talk to the FPGA, |
# and little more. |
wbsettime: $(OBJDIR)/wbsettime.o $(BUSOBJS) |
$(CXX) -g $^ -o $@ |
mtest: $(OBJDIR)/mtest.o $(BUSOBJS) |
87,10 → 94,10
$(CXX) -g $^ -o $@ |
dumpflash: $(OBJDIR)/dumpflash.o $(BUSOBJS) |
$(CXX) -g $^ -o $@ |
eqspiscope: $(OBJDIR)/eqspiscope.o $(OBJDIR)/scopecls.o $(BUSOBJS) |
$(CXX) -g $^ -o $@ |
sdramscope: $(OBJDIR)/sdramscope.o $(OBJDIR)/scopecls.o $(BUSOBJS) |
$(CXX) -g $^ -o $@ |
|
# |
# Programs that depend upon not just the bus objects, but the flash driver |
# as well. |
wbprogram: $(OBJDIR)/wbprogram.o $(OBJDIR)/flashdrvr.o $(BUSOBJS) |
$(CXX) -g $^ -o $@ |
zipload: $(OBJDIR)/zipload.o $(OBJDIR)/flashdrvr.o $(BUSOBJS) |
98,6 → 105,12
|
|
## SCOPES |
# These depend upon the scopecls.o, the bus objects, as well as their |
# main file(s). |
eqspiscope: $(OBJDIR)/eqspiscope.o $(OBJDIR)/scopecls.o $(BUSOBJS) |
$(CXX) -g $^ -o $@ |
sdramscope: $(OBJDIR)/sdramscope.o $(OBJDIR)/scopecls.o $(BUSOBJS) |
$(CXX) -g $^ -o $@ |
cfgscope: $(OBJDIR)/cfgscope.o $(OBJDIR)/scopecls.o $(BUSOBJS) |
$(CXX) -g $^ -o $@ |
cpuscope: $(OBJDIR)/cpuscope.o $(OBJDIR)/scopecls.o $(BUSOBJS) |
111,6 → 124,11
wbuscope: $(OBJDIR)/wbuscope.o $(OBJDIR)/scopecls.o $(BUSOBJS) |
$(CXX) -g $^ -o $@ |
|
# |
# The ZipDebugger is a bit more difficult to build, as it wants to be able |
# to disassemble opcodes given to it. Hence, it depends upon the zparser.cpp, |
# zopcodes.cpp, and twoc.cpp files from the ZipCPU build directory. |
# |
DBGRAW := zparser.cpp zopcodes.cpp twoc.cpp |
DBGSRCS := $(addprefix $(ZIPD)/,$(DBGRAW)) |
DBGOBJS := $(addprefix $(OBJDIR)/,$(subst .cpp,.o,$(DBGRAW))) |
/cpuscope.cpp
67,7 → 67,7
class CPUSCOPE : public SCOPE { |
public: |
CPUSCOPE(FPGA *fpga, unsigned addr, bool vecread) |
: SCOPE(fpga, addr, false, false) {}; |
: SCOPE(fpga, addr, false, vecread) {}; |
~CPUSCOPE(void) {} |
virtual void decode(DEVBUS::BUSW val) const { |
if (val & 0x80000000) |