From: Brian Norris <banorris@uci.edu>
Date: Thu, 14 Jun 2012 06:53:44 +0000 (-0700)
Subject: snapshot: don't export page-aligning functions
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=7d2149ffbbc1a3514838d721a71bb0d4c81054b3;hp=339c89039e14e4f2433d4af0b0d2ae6e6c41e028

snapshot: don't export page-aligning functions

Declare these functions static and move them upward in the file.
---

diff --git a/snapshot.cc b/snapshot.cc
index bb599010..99b9d795 100644
--- a/snapshot.cc
+++ b/snapshot.cc
@@ -38,8 +38,22 @@ static ucontext_t savedUserSnapshotContext;
 static snapshot_id snapshotid = 0;
 #endif
 
+/** PageAlignedAdressUpdate return a page aligned address for the
+ * address being added as a side effect the numBytes are also changed.
+ */
+static void * PageAlignAddressUpward(void * addr) {
+	return (void *)((((uintptr_t)addr)+PAGESIZE-1)&~(PAGESIZE-1));
+}
+
 #if USE_MPROTECT_SNAPSHOT
 
+/** ReturnPageAlignedAddress returns a page aligned address for the
+ * address being added as a side effect the numBytes are also changed.
+ */
+static void * ReturnPageAlignedAddress(void * addr) {
+	return (void *)(((uintptr_t)addr)&~(PAGESIZE-1));
+}
+
 /** The initSnapShotRecord method initialized the snapshotting data
  *  structures for the mprotect based snapshot. 
  */
@@ -90,21 +104,6 @@ void HandlePF( int sig, siginfo_t *si, void * unused){
 #endif //nothing to handle for non snapshotting case.
 }
 
-/** ReturnPageAlignedAddress returns a page aligned address for the
- * address being added as a side effect the numBytes are also changed.
- */
-
-void * ReturnPageAlignedAddress(void * addr) {
-	return (void *)(((uintptr_t)addr)&~(PAGESIZE-1));
-}
-
-/** PageAlignedAdressUpdate return a page aligned address for the
- * address being added as a side effect the numBytes are also changed.
- */
-
-void * PageAlignAddressUpward(void * addr) {
-	return (void *)((((uintptr_t)addr)+PAGESIZE-1)&~(PAGESIZE-1));
-}
 void createSharedLibrary(){
 #if !USE_MPROTECT_SNAPSHOT
 	//step 1. create shared memory.
diff --git a/snapshotimp.h b/snapshotimp.h
index 90bbc833..6b58ed7e 100644
--- a/snapshotimp.h
+++ b/snapshotimp.h
@@ -55,8 +55,6 @@ struct SnapShot {
 
 //Global reference to snapshot data structure
 extern struct SnapShot * snapshotrecord;
-void * ReturnPageAlignedAddress( void *);
-void * PageAlignAddressUpward( void *);
 #else
 struct Snapshot {
 char *mSharedMemoryBase;