projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Normalize style of patches to reduce changes later.
[pintos-anon]
/
solutions
/
p1.patch
diff --git
a/solutions/p1.patch
b/solutions/p1.patch
index fbfb405b09a090df9889f5b279c6947c1a43756c..fd3928b26e18e29883d8ddd8786ef5f1803d8d18 100644
(file)
--- a/
solutions/p1.patch
+++ b/
solutions/p1.patch
@@
-1,6
+1,7
@@
+Index: src/devices/timer.c
diff -u src/devices/timer.c~ src/devices/timer.c
diff -u src/devices/timer.c~ src/devices/timer.c
---- src/devices/timer.c~
2005-05-24 15:52:43.000000000 -0700
-+++ src/devices/timer.c
2005-05-26 15:19:20.000000000 -0700
+--- src/devices/timer.c~
++++ src/devices/timer.c
@@ -23,6 +23,9 @@ static volatile int64_t ticks;
Initialized by timer_calibrate(). */
static unsigned loops_per_tick;
@@ -23,6 +23,9 @@ static volatile int64_t ticks;
Initialized by timer_calibrate(). */
static unsigned loops_per_tick;
@@
-77,9
+78,10
@@
diff -u src/devices/timer.c~ src/devices/timer.c
}
/* Returns true if LOOPS iterations waits for more than one timer
}
/* Returns true if LOOPS iterations waits for more than one timer
+Index: src/threads/fixed-point.h
diff -u src/threads/fixed-point.h~ src/threads/fixed-point.h
diff -u src/threads/fixed-point.h~ src/threads/fixed-point.h
---- src/threads/fixed-point.h~
1969-12-31 16:00:00.000000000 -0800
-+++ src/threads/fixed-point.h
2005-06-02 14:11:21.000000000 -0700
+--- src/threads/fixed-point.h~
++++ src/threads/fixed-point.h
@@ -0,0 +1,120 @@
+#ifndef THREADS_FIXED_POINT_H
+#define THREADS_FIXED_POINT_H
@@ -0,0 +1,120 @@
+#ifndef THREADS_FIXED_POINT_H
+#define THREADS_FIXED_POINT_H
@@
-201,9
+203,10
@@
diff -u src/threads/fixed-point.h~ src/threads/fixed-point.h
+}
+
+#endif /* threads/fixed-point.h */
+}
+
+#endif /* threads/fixed-point.h */
+Index: src/threads/synch.c
diff -u src/threads/synch.c~ src/threads/synch.c
diff -u src/threads/synch.c~ src/threads/synch.c
---- src/threads/synch.c~
2005-05-24 20:47:28.000000000 -0700
-+++ src/threads/synch.c
2005-06-02 14:20:15.000000000 -0700
+--- src/threads/synch.c~
++++ src/threads/synch.c
@@ -114,10 +114,28 @@ sema_up (struct semaphore *sema)
ASSERT (sema != NULL);
@@ -114,10 +114,28 @@ sema_up (struct semaphore *sema)
ASSERT (sema != NULL);
@@
-354,9
+357,10
@@
diff -u src/threads/synch.c~ src/threads/synch.c
}
/* Wakes up all threads, if any, waiting on COND (protected by
}
/* Wakes up all threads, if any, waiting on COND (protected by
+Index: src/threads/thread.c
diff -u src/threads/thread.c~ src/threads/thread.c
diff -u src/threads/thread.c~ src/threads/thread.c
---- src/threads/thread.c~
2005-06-02 14:35:12.000000000 -0700
-+++ src/threads/thread.c
2005-06-02 14:55:56.000000000 -0700
+--- src/threads/thread.c~
++++ src/threads/thread.c
@@ -5,12 +5,14 @@
#include <stdio.h>
#include <string.h>
@@ -5,12 +5,14 @@
#include <stdio.h>
#include <string.h>
@@
-690,9
+694,10
@@
diff -u src/threads/thread.c~ src/threads/thread.c
}
/* Completes a thread switch by activating the new thread's page
}
/* Completes a thread switch by activating the new thread's page
+Index: src/threads/thread.h
diff -u src/threads/thread.h~ src/threads/thread.h
diff -u src/threads/thread.h~ src/threads/thread.h
---- src/threads/thread.h~
2005-06-02 14:32:36.000000000 -0700
-+++ src/threads/thread.h
2005-06-02 14:38:46.000000000 -0700
+--- src/threads/thread.h~
++++ src/threads/thread.h
@@ -4,6 +4,8 @@
#include <debug.h>
#include <list.h>
@@ -4,6 +4,8 @@
#include <debug.h>
#include <list.h>