Merge pull request #531 from sstsimulator/devel

Automatically Merged using masterautomerge.py
sstsimulator · Dec 6, 2016 · 5107acb · 5107acb
2 parents b676760 + 4108adb
commit 5107acb
Show file tree

Hide file tree

Showing 13 changed files with 767 additions and 328 deletions.
diff --git a/src/sst/elements/Samba/1 b/src/sst/elements/Samba/1
diff --git a/src/sst/elements/Samba/Makefile.am b/src/sst/elements/Samba/Makefile.am
@@ -14,7 +14,9 @@ libSamba_la_SOURCES = \
 	TLBUnit.h \
 	TLBentry.h \
 	TLBhierarchy.h \
-	TLBhierarchy.cc
+	TLBhierarchy.cc \
+	PageTableWalker.h \
+	PageTableWalker.cc
 
 
 libSamba_la_CPPFLAGS = \
@@ -29,14 +31,6 @@ libSamba_la_LDFLAGS = \
 libSamba_la_LIBADD = \
 	$(SST_SYSTEMC_LIB)
 
-EXTRA_DIST = \
-	tests/gupsgen_mmu.py \
-	tests/gupsgen.py \
-	tests/stencil3dbench_mmu.py \
-	tests/stencil3dbench.py \
-	tests/streambench_mmu.py \
-	tests/streambench.py
-
 #noinst_PROGRAMS = infogather
 #infogather_SOURCES = infogather.cc
 #infogather_CPPFLAGS = -I/usr/local/systemc-2.3/include \