Changeset 815 for soft

Timestamp:

Apr 1, 2016, 2:23:41 PM (8 years ago)

Author:

bouyer

Message:

Deal with x_width/y_width different from 4.

Location:

soft/giet_vm

Files:

• giet_common/pmem.c (modified) (2 diffs)
• giet_kernel/sys_handler.c (modified) (1 diff)

soft/giet_vm/giet_common/pmem.c

@@ -74 +74 @@
     p->nxt_bppi = bpi + n;
 
-    return (x << 24) + (y << 20) + (bpi << 9);
+    return (x << (20 + Y_WIDTH)) + (y << 20) + (bpi << 9);
 
 } // end get_big_ppn()
@@ -115 +115 @@
     p->nxt_sppi = p->nxt_sppi + n;
 
-    return (x << 24) + (y << 20) + (bpi << 9) + spi;
+    return (x << (20 + Y_WIDTH)) + (y << 20) + (bpi << 9) + spi;
 
 } // end _get_small_ppn()

soft/giet_vm/giet_kernel/sys_handler.c

@@ -3981 +3981 @@
     unsigned long long paddr = _v2p_translate( (unsigned int)ptr , &flags );
     
-    *x = (paddr>>36) & 0xF;
-    *y = (paddr>>32) & 0xF;
+    *x = (paddr>> (32 + Y_WIDTH)) & ((1 << X_WIDTH) - 1);
+    *y = (paddr>>32) & ((1 << Y_WIDTH) - 1);
 
     return SYSCALL_OK;