X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=solutions%2Fp2.patch;h=1de7f57166997b328d144103fc38c95349532a8b;hb=a7fefbb3d10e9bcc3a9baf9d0f3b6e8b0eac83d4;hp=8f648559aaa3e8390f1f40d39ab6432c7f1d09dc;hpb=597cd3a7dc722167fba91c8c7f572ca80107c966;p=pintos-anon

diff --git a/solutions/p2.patch b/solutions/p2.patch
index 8f64855..1de7f57 100644
--- a/solutions/p2.patch
+++ b/solutions/p2.patch
@@ -1,23 +1,10 @@
-Index: constants.h
-===================================================================
-RCS file: /afs/ir.stanford.edu/users/b/l/blp/private/cvs/pintos/src/constants.h,v
-retrieving revision 1.4
-diff -u -p -r1.4 constants.h
---- constants.h	19 Oct 2004 17:37:30 -0000	1.4
-+++ constants.h	1 Jan 2005 02:13:41 -0000
-@@ -8,4 +8,4 @@
- /*#define MACRONAME 1 */
- 
- /* Uncomment if if you've implemented thread_join(). */
--/*#define THREAD_JOIN_IMPLEMENTED 1*/
-+#define THREAD_JOIN_IMPLEMENTED 1
-Index: threads/synch.c
+Index: src/threads/synch.c
 ===================================================================
 RCS file: /afs/ir.stanford.edu/users/b/l/blp/private/cvs/pintos/src/threads/synch.c,v
 retrieving revision 1.15
 diff -u -p -r1.15 synch.c
---- threads/synch.c	31 Dec 2004 21:13:38 -0000	1.15
-+++ threads/synch.c	1 Jan 2005 02:13:41 -0000
+--- src/threads/synch.c	31 Dec 2004 21:13:38 -0000	1.15
++++ src/threads/synch.c	1 Jan 2005 02:13:41 -0000
 @@ -330,3 +330,45 @@ cond_name (const struct condition *cond)
  
    return cond->name;
@@ -64,13 +51,13 @@ diff -u -p -r1.15 synch.c
 +    }
 +  lock_release (&latch->monitor_lock);
 +}
-Index: threads/synch.h
+Index: src/threads/synch.h
 ===================================================================
 RCS file: /afs/ir.stanford.edu/users/b/l/blp/private/cvs/pintos/src/threads/synch.h,v
 retrieving revision 1.7
 diff -u -p -r1.7 synch.h
---- threads/synch.h	29 Sep 2004 01:04:09 -0000	1.7
-+++ threads/synch.h	1 Jan 2005 02:13:41 -0000
+--- src/threads/synch.h	29 Sep 2004 01:04:09 -0000	1.7
++++ src/threads/synch.h	1 Jan 2005 02:13:41 -0000
 @@ -44,4 +44,16 @@ void cond_signal (struct condition *, st
  void cond_broadcast (struct condition *, struct lock *);
  const char *cond_name (const struct condition *);
@@ -88,13 +75,13 @@ diff -u -p -r1.7 synch.h
 +void latch_release (struct latch *);
 +
  #endif /* threads/synch.h */
-Index: threads/thread.c
+Index: src/threads/thread.c
 ===================================================================
 RCS file: /afs/ir.stanford.edu/users/b/l/blp/private/cvs/pintos/src/threads/thread.c,v
 retrieving revision 1.48
 diff -u -p -r1.48 thread.c
---- threads/thread.c	9 Oct 2004 18:01:37 -0000	1.48
-+++ threads/thread.c	1 Jan 2005 02:13:42 -0000
+--- src/threads/thread.c	9 Oct 2004 18:01:37 -0000	1.48
++++ src/threads/thread.c	1 Jan 2005 02:13:42 -0000
 @@ -13,6 +13,7 @@
  #include "threads/synch.h"
  #ifdef USERPROG
@@ -157,12 +144,12 @@ diff -u -p -r1.48 thread.c
    schedule ();
    NOT_REACHED ();
  }
-@@ -300,6 +323,26 @@ kernel_thread (thread_func *function, vo
-   function (aux);       /* Execute the thread function. */
-   thread_exit ();       /* If function() returns, kill the thread. */
- }
-+
-+/* Waits for thread with tid CHILD_TID to die. */
+@@ -283,8 +290,22 @@ thread_block (void) 
+    This function will be implemented in problem 1-2.  For now, it
+    does nothing. */
+-void
+-thread_join (tid_t child_tid UNUSED) 
+-{
 +int
 +thread_join (tid_t child_tid) 
 +{
@@ -176,14 +163,13 @@ diff -u -p -r1.48 thread.c
 +      if (child->tid == child_tid) 
 +        {
 +          latch_acquire (&child->ready_to_die);
-+          return child->exit_code; 
++          return child->exit_code;
 +        }
 +    }
 +  return -1;
-+}
- 
- /* Returns the running thread. */
- struct thread *
+ }
+ 
+ /* Sets the current thread's priority to NEW_PRIORITY. */
 @@ -336,6 +379,12 @@ init_thread (struct thread *t, const cha
    strlcpy (t->name, name, sizeof t->name);
    t->stack = (uint8_t *) t + PGSIZE;
@@ -197,13 +183,13 @@ diff -u -p -r1.48 thread.c
    t->magic = THREAD_MAGIC;
  }
  
-Index: threads/thread.h
+Index: src/threads/thread.h
 ===================================================================
 RCS file: /afs/ir.stanford.edu/users/b/l/blp/private/cvs/pintos/src/threads/thread.h,v
 retrieving revision 1.28
 diff -u -p -r1.28 thread.h
---- threads/thread.h	29 Sep 2004 01:04:20 -0000	1.28
-+++ threads/thread.h	1 Jan 2005 02:13:42 -0000
+--- src/threads/thread.h	29 Sep 2004 01:04:20 -0000	1.28
++++ src/threads/thread.h	1 Jan 2005 02:13:42 -0000
 @@ -4,6 +4,7 @@
  #include <debug.h>
  #include <list.h>
@@ -237,21 +223,21 @@ diff -u -p -r1.28 thread.h
  
      /* Owned by thread.c. */
 @@ -120,7 +132,7 @@ void thread_exit (void) NO_RETURN;
+ void thread_exit (void) NO_RETURN;
  void thread_yield (void);
  
- /* This function will be implemented in problem 1-2. */
 -void thread_join (tid_t);
 +int thread_join (tid_t);
  
- /* These functions will be implemented in problem 1-3. */
  void thread_set_priority (int);
-Index: userprog/exception.c
+ int thread_get_priority (void);
+Index: src/userprog/exception.c
 ===================================================================
 RCS file: /afs/ir.stanford.edu/users/b/l/blp/private/cvs/pintos/src/userprog/exception.c,v
 retrieving revision 1.10
 diff -u -p -r1.10 exception.c
---- userprog/exception.c	26 Sep 2004 21:15:17 -0000	1.10
-+++ userprog/exception.c	1 Jan 2005 02:13:42 -0000
+--- src/userprog/exception.c	26 Sep 2004 21:15:17 -0000	1.10
++++ src/userprog/exception.c	1 Jan 2005 02:13:42 -0000
 @@ -147,6 +147,14 @@ page_fault (struct intr_frame *f) 
    write = (f->error_code & PF_W) != 0;
    user = (f->error_code & PF_U) != 0;
@@ -267,13 +253,13 @@ diff -u -p -r1.10 exception.c
    /* To implement virtual memory, delete the rest of the function
       body, and replace it with code that brings in the page to
       which fault_addr refers. */
-Index: userprog/process.c
+Index: src/userprog/process.c
 ===================================================================
 RCS file: /afs/ir.stanford.edu/users/b/l/blp/private/cvs/pintos/src/userprog/process.c,v
 retrieving revision 1.6
 diff -u -p -r1.6 process.c
---- userprog/process.c	15 Dec 2004 02:32:02 -0000	1.6
-+++ userprog/process.c	1 Jan 2005 02:13:43 -0000
+--- src/userprog/process.c	15 Dec 2004 02:32:02 -0000	1.6
++++ src/userprog/process.c	1 Jan 2005 02:13:43 -0000
 @@ -18,7 +18,17 @@
  #include "threads/thread.h"
  
@@ -293,7 +279,7 @@ diff -u -p -r1.6 process.c
  
  /* Starts a new thread running a user program loaded from
     FILENAME.  The new thread may be scheduled before
-@@ -26,31 +36,31 @@ static bool load (const char *cmdline, v
+@@ -26,31 +36,32 @@ static bool load (const char *cmdline, v
  tid_t
  process_execute (const char *filename) 
  {
@@ -334,7 +320,7 @@ diff -u -p -r1.6 process.c
 -  char *filename = filename_;
 +  struct exec_info *exec = exec_;
    struct intr_frame if_;
--  bool success;
+   bool success;
  
    /* Initialize interrupt frame and load executable. */
    memset (&if_, 0, sizeof if_);
@@ -346,10 +332,9 @@ diff -u -p -r1.6 process.c
 -
 -  /* If load failed, quit. */
 -  palloc_free_page (filename);
--  if (!success) 
-+  exec->success = load (exec->filename, &if_.eip, &if_.esp);
++  success = exec->success = load (exec->filename, &if_.eip, &if_.esp);
 +  sema_up (&exec->load_done);
-+  if (!exec->success)
+   if (!success) 
      thread_exit ();
  
    /* Switch page tables. */
@@ -521,13 +506,13 @@ diff -u -p -r1.6 process.c
        else
          palloc_free_page (kpage);
      }
-Index: userprog/syscall.c
+Index: src/userprog/syscall.c
 ===================================================================
 RCS file: /afs/ir.stanford.edu/users/b/l/blp/private/cvs/pintos/src/userprog/syscall.c,v
 retrieving revision 1.4
 diff -u -p -r1.4 syscall.c
---- userprog/syscall.c	26 Sep 2004 21:15:17 -0000	1.4
-+++ userprog/syscall.c	1 Jan 2005 02:13:43 -0000
+--- src/userprog/syscall.c	26 Sep 2004 21:15:17 -0000	1.4
++++ src/userprog/syscall.c	1 Jan 2005 02:13:43 -0000
 @@ -1,20 +1,478 @@
  #include "userprog/syscall.h"
  #include <stdio.h>
@@ -640,7 +625,7 @@ diff -u -p -r1.4 syscall.c
 +get_user (uint8_t *dst, const uint8_t *usrc)
 +{
 +  int eax;
-+  asm ("movl $1f, %%eax; movb %2, %%al; movb %%al, %0; 1:"
++  asm ("mov %%eax, offset 1f; mov %%al, %2; mov %0, %%al; 1:"
 +       : "=m" (*dst), "=&a" (eax) : "m" (*usrc));
 +  return eax != 0;
 +}
@@ -652,7 +637,7 @@ diff -u -p -r1.4 syscall.c
 +put_user (uint8_t *udst, uint8_t byte)
 +{
 +  int eax;
-+  asm ("movl $1f, %%eax; movb %b2, %0; 1:"
++  asm ("mov %%eax, offset 1f; mov %0, %b2; 1:"
 +       : "=m" (*udst), "=&a" (eax) : "r" (byte));
 +  return eax != 0;
 +}
@@ -1011,13 +996,13 @@ diff -u -p -r1.4 syscall.c
 +      free (fd);
 +    }
  }
-Index: userprog/syscall.h
+Index: src/userprog/syscall.h
 ===================================================================
 RCS file: /afs/ir.stanford.edu/users/b/l/blp/private/cvs/pintos/src/userprog/syscall.h,v
 retrieving revision 1.2
 diff -u -p -r1.2 syscall.h
---- userprog/syscall.h	6 Sep 2004 05:38:45 -0000	1.2
-+++ userprog/syscall.h	1 Jan 2005 02:13:43 -0000
+--- src/userprog/syscall.h	6 Sep 2004 05:38:45 -0000	1.2
++++ src/userprog/syscall.h	1 Jan 2005 02:13:43 -0000
 @@ -2,5 +2,6 @@
  #define USERPROG_SYSCALL_H