Skip to content
This repository was archived by the owner on May 19, 2024. It is now read-only.

Commit f1911b1

Browse files
author
Your Name
committed
trace
1 parent 97caf8a commit f1911b1

File tree

3 files changed

+681
-9
lines changed

3 files changed

+681
-9
lines changed

Makefile

+15-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ ORBTOP = orbtop
1919
ORBDUMP = orbdump
2020
ORBSTAT = orbstat
2121

22+
TRACE = trace
23+
2224
##########################################################################
2325
# Check Host OS
2426
##########################################################################
@@ -104,11 +106,13 @@ endif
104106
ifeq ($(WITH_NWCLIENT),1)
105107
ORBUCULUM_CFILES += $(App_DIR)/nwclient.c
106108
endif
107-
ORBCAT_CFILES = $(App_DIR)/$(ORBCAT).c
109+
ORBCAT_CFILES = $(App_DIR)/$(ORBCAT).c
108110
ORBTOP_CFILES = $(App_DIR)/$(ORBTOP).c $(App_DIR)/symbols.c $(EXT)/cJSON.c
109111
ORBDUMP_CFILES = $(App_DIR)/$(ORBDUMP).c
110112
ORBSTAT_CFILES = $(App_DIR)/$(ORBSTAT).c $(App_DIR)/symbols.c
111113

114+
TRACE_CFILES = $(App_DIR)/$(TRACE).c
115+
112116
# FPGA Files
113117
# ==========
114118

@@ -191,6 +195,10 @@ ORBSTAT_OBJS = $(OBJS) $(patsubst %.c,%.o,$(ORBSTAT_CFILES))
191195
ORBSTAT_POBJS = $(POJBS) $(patsubst %,$(OLOC)/%,$(ORBSTAT_OBJS))
192196
ORBSTAT_PDEPS = $(PDEPS) $(ORBSTAT_POBJS:.o=.d)
193197

198+
TRACE_OBJS = $(OBJS) $(patsubst %.c,%.o,$(TRACE_CFILES))
199+
TRACE_POBJS = $(POJBS) $(patsubst %,$(OLOC)/%,$(TRACE_OBJS))
200+
TRACE_PDEPS = $(PDEPS) $(TRACE_POBJS:.o=.d)
201+
194202
CFILES += $(App_DIR)/generics.c
195203

196204
##########################################################################
@@ -208,7 +216,7 @@ $(OLOC)/%.o : %.c
208216
$(call cmd, \$(CC) -c $(CFLAGS) -MMD -o $@ $< ,\
209217
Compiling $<)
210218

211-
build: $(ORBUCULUM) $(ORBCAT) $(ORBTOP) $(ORBDUMP) $(ORBSTAT)
219+
build: $(ORBUCULUM) $(ORBCAT) $(ORBTOP) $(ORBDUMP) $(ORBSTAT) $(TRACE)
212220

213221
$(ORBLIB) : get_version $(ORBLIB_POBJS)
214222
$(Q)$(AR) rcs $(OLOC)/lib$(ORBLIB).a $(ORBLIB_POBJS)
@@ -234,11 +242,15 @@ $(ORBSTAT) : $(ORBLIB) $(ORBSTAT_POBJS)
234242
$(Q)$(LD) $(LDFLAGS) -o $(OLOC)/$(ORBSTAT) $(MAP) $(ORBSTAT_POBJS) $(LDLIBS)
235243
-@echo "Completed build of" $(ORBSTAT)
236244

245+
$(TRACE) : $(ORBLIB) $(TRACE_POBJS)
246+
$(Q)$(LD) $(LDFLAGS) -o $(OLOC)/$(TRACE) $(MAP) $(TRACE_POBJS) $(LDLIBS)
247+
-@echo "Completed build of" $(TRACE)
248+
237249
tags:
238250
-@etags $(CFILES) 2> /dev/null
239251

240252
clean:
241-
-$(call cmd, \rm -f $(POBJS) $(LD_TEMP) $(ORBUCULUM) $(ORBCAT) $(ORBDUMP) $(ORBSTAT) $(OUTFILE).map $(EXPORT) ,\
253+
-$(call cmd, \rm -f $(POBJS) $(LD_TEMP) $(ORBUCULUM) $(ORBCAT) $(ORBDUMP) $(ORBSTAT) $(TRACE) $(OUTFILE).map $(EXPORT) ,\
242254
Cleaning )
243255
$(Q)-rm -rf SourceDoc/*
244256
$(Q)-rm -rf *~ core

Src/orbcat.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ struct
9494

9595
char *file; /* File host connection */
9696
bool fileTerminate; /* Terminate when file read isn't successful */
97-
} options = {.forceITMSync = true, .tpiuITMChannel = 1, .port = SERVER_PORT, .server = "localhost"};
97+
} options = {.hwOutputs = 1, .forceITMSync = true, .tpiuITMChannel = 1, .port = SERVER_PORT, .server = "localhost"};
9898

9999
struct
100100
{
@@ -169,11 +169,6 @@ void _handleDataRWWP( struct watchMsg *m, struct ITMDecoder *i )
169169
{
170170
assert( m->msgtype == MSG_DATA_RWWP );
171171

172-
if ( !( options.hwOutputs & ( 1 << HWEVENT_RWWT ) ) )
173-
{
174-
return;
175-
}
176-
177172
fprintf( stdout, "%d,%d,%s,0x%x" EOL, HWEVENT_RWWT, m->comp, m->isWrite ? "Write" : "Read", m->data );
178173
}
179174
// ====================================================================================================

0 commit comments

Comments
 (0)