Changeset 567807b1 in mainline for arch/mips32/src/mm/tlb.c

Timestamp:

2006-05-24T17:03:29Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8d6bc2d5

Parents:

82da5f5

Message:

Modify the hierarchy of page fault handlers to pass access mode that caused the fault.
Architectures are required to pass either PF_ACCESS_READ, PF_ACCESS_WRITE or PF_ACCESS_EXEC
to as_page_fault(), depending on the cause of the fault.

File:

• arch/mips32/src/mm/tlb.c (modified) (7 diffs)

arch/mips32/src/mm/tlb.c

@@ -45 +45 @@
 static void tlb_modified_fail(istate_t *istate);
 
-static pte_t *find_mapping_and_check(__address badvaddr, istate_t *istate, int *pfrc);
+static pte_t *find_mapping_and_check(__address badvaddr, int access, istate_t *istate, int *pfrc);
 
 static void prepare_entry_lo(entry_lo_t *lo, bool g, bool v, bool d, bool cacheable, __address pfn);
@@ -102 +102 @@
         page_table_lock(AS, true);
 
-        pte = find_mapping_and_check(badvaddr, istate, &pfrc);
+        pte = find_mapping_and_check(badvaddr, PF_ACCESS_READ, istate, &pfrc);
         if (!pte) {
                 switch (pfrc) {
@@ -187 +187 @@
         }
 
-        pte = find_mapping_and_check(badvaddr, istate, &pfrc);
+        pte = find_mapping_and_check(badvaddr, PF_ACCESS_READ, istate, &pfrc);
         if (!pte) {
                 switch (pfrc) {
@@ -271 +271 @@
         }
 
-        pte = find_mapping_and_check(badvaddr, istate, &pfrc);
+        pte = find_mapping_and_check(badvaddr, PF_ACCESS_WRITE, istate, &pfrc);
         if (!pte) {
                 switch (pfrc) {
@@ -367 +367 @@
  *
  * @param badvaddr Faulting virtual address.
+ * @param access Access mode that caused the fault.
  * @param istate Pointer to interrupted state.
  * @param pfrc Pointer to variable where as_page_fault() return code will be stored.
@@ -372 +373 @@
  * @return PTE on success, NULL otherwise.
  */
-pte_t *find_mapping_and_check(__address badvaddr, istate_t *istate, int *pfrc)
+pte_t *find_mapping_and_check(__address badvaddr, int access, istate_t *istate, int *pfrc)
 {
         entry_hi_t hi;
@@ -405 +406 @@
                  */
                 page_table_unlock(AS, true);
-                switch (rc = as_page_fault(badvaddr, istate)) {
+                switch (rc = as_page_fault(badvaddr, access, istate)) {
                 case AS_PF_OK:
                         /*