Skip to content
Snippets Groups Projects
Commit e275a0c7 authored by Eetu Pesonen's avatar Eetu Pesonen
Browse files

Add option for logfile path

parent 969830bd
No related branches found
No related tags found
No related merge requests found
...@@ -24,13 +24,13 @@ SUBOBJS = ...@@ -24,13 +24,13 @@ SUBOBJS =
OBJS = $(patsubst $(SOURCEDIR)/%.cc,$(BUILDDIR)/%.cc.o,$(SOURCES)) OBJS = $(patsubst $(SOURCEDIR)/%.cc,$(BUILDDIR)/%.cc.o,$(SOURCES))
ASMOBJS = $(patsubst %.s,$(BUILDDIR)/%.s.o,$(ASMSOURCES)) ASMOBJS = $(patsubst %.s,$(BUILDDIR)/%.s.o,$(ASMSOURCES))
all: dir $(BUILDDIR)/$(EXECUTABLE) $(BINFILE) all: dir $(BUILDDIR)/$(EXECUTABLE) $(BUILDDIR)/$(BINFILE)
dir: dir:
mkdir -p $(BUILDDIR) mkdir -p $(BUILDDIR)
run: all run: all
$(BUILDDIR)/$(EXECUTABLE) -b $(BINFILE) -t -e $(ELFFILE) $(BUILDDIR)/$(EXECUTABLE) -b $(BUILDDIR)/$(BINFILE) -e $(BUILDDIR)/$(ELFFILE) -l $(BUILDDIR)/rpu32.log -t
$(BUILDDIR)/$(EXECUTABLE): $(OBJS) $(BUILDDIR)/$(EXECUTABLE): $(OBJS)
$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) $(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)
...@@ -38,16 +38,16 @@ $(BUILDDIR)/$(EXECUTABLE): $(OBJS) ...@@ -38,16 +38,16 @@ $(BUILDDIR)/$(EXECUTABLE): $(OBJS)
$(OBJS): $(BUILDDIR)/%.cc.o : $(SOURCEDIR)/%.cc $(OBJS): $(BUILDDIR)/%.cc.o : $(SOURCEDIR)/%.cc
$(CC) $(CPPFLAGS) $(CXXFLAGS) -I$(INCDIR) $< -o $@ $(CC) $(CPPFLAGS) $(CXXFLAGS) -I$(INCDIR) $< -o $@
$(BINFILE) : $(ELFFILE) $(BUILDDIR)/$(BINFILE) : $(BUILDDIR)/$(ELFFILE)
$(OBJCOPY68) -O binary $^ $@ $(OBJCOPY68) -O binary $^ $@
$(ELFFILE) : $(ASMOBJS) $(BUILDDIR)/$(ELFFILE) : $(ASMOBJS)
$(LD68) -T link.ld $^ -o $@ $(LD68) -T link.ld $^ -o $@
$(ASMOBJS) : $(ASMSOURCES) $(ASMOBJS) : $(ASMSOURCES)
$(AS68) $^ -o $@ $(AS68) $^ -o $@
test: $(BUILDDIR)/$(EXECUTABLE) test: dir $(BUILDDIR)/$(EXECUTABLE)
sh -c ./test.pl sh -c ./test.pl
.PHONY: tools .PHONY: tools
...@@ -58,8 +58,8 @@ tools: ...@@ -58,8 +58,8 @@ tools:
clean: clean:
rm -Rf $(BUILDDIR)/$(EXECUTABLE) rm -Rf $(BUILDDIR)/$(EXECUTABLE)
rm -Rf $(OBJS) rm -Rf $(OBJS)
rm -Rf $(BINFILE) rm -Rf $(BUILDDIR)/$(BINFILE)
rm -Rf $(ELFFILE) rm -Rf $(BUILDDIR)/$(ELFFILE)
rm -Rf $(ASMOBJS) rm -Rf $(ASMOBJS)
clean-all: clean clean-all: clean
......
...@@ -77,7 +77,7 @@ sub make_test_pkg { ...@@ -77,7 +77,7 @@ sub make_test_pkg {
sub run_test_pkg { sub run_test_pkg {
my ($test_pkg) = @_; my ($test_pkg) = @_;
my $ret = system("build/rpu32emu -t -q -y /tmp/rpu32emu-$test_pkg.yaml"); my $ret = system("build/rpu32emu -t -q -y /tmp/rpu32emu-$test_pkg.yaml -l /tmp/rpu32emu-$test_pkg.log");
my $outfile = LoadFile("/tmp/rpu32emu-$test_pkg-out.yaml"); my $outfile = LoadFile("/tmp/rpu32emu-$test_pkg-out.yaml");
......
...@@ -10,17 +10,16 @@ Logger* logger = nullptr; ...@@ -10,17 +10,16 @@ Logger* logger = nullptr;
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
logger = new LoggerFile("rpu32.log");
char binfile[256] = ""; char binfile[256] = "";
char elffile[256] = ""; char elffile[256] = "";
char ymlfile[256] = ""; char ymlfile[256] = "";
char logfile[256] = "";
bool trace = false; bool trace = false;
bool quiet = false; bool quiet = false;
char opt; char opt;
while ((opt = getopt(argc, argv, ":b:te:y:q")) != -1) while ((opt = getopt(argc, argv, ":b:te:y:ql:")) != -1)
{ {
switch (opt) switch (opt)
{ {
...@@ -33,6 +32,9 @@ int main(int argc, char* argv[]) ...@@ -33,6 +32,9 @@ int main(int argc, char* argv[])
case 'y': case 'y':
strncpy(ymlfile, optarg, 256); strncpy(ymlfile, optarg, 256);
break; break;
case 'l':
strncpy(logfile, optarg, 256);
break;
case 't': case 't':
trace = true; trace = true;
break; break;
...@@ -41,12 +43,17 @@ int main(int argc, char* argv[]) ...@@ -41,12 +43,17 @@ int main(int argc, char* argv[])
break; break;
case ':': case ':':
case '?': case '?':
printf("usage: rpu32emu -b file.bin -e file.elf [-t]"); printf("usage: rpu32emu -b file.bin -e file.elf [-t] [-q] [-y conf.yaml] [-l logfile.log]");
return EXIT_FAILURE; return EXIT_FAILURE;
break; break;
} }
} }
if (strlen(logfile) > 0)
logger = new LoggerFile(logfile);
else
logger = new LoggerFile("rpu32.log");
RPU32* rpu = nullptr; RPU32* rpu = nullptr;
int ret = EXIT_SUCCESS; int ret = EXIT_SUCCESS;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment