update lab1 to the latest version

aaron-cz · Jan 18, 2017 · f3c7779 · f3c7779
1 parent 255128c
commit f3c7779
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/L1-Data-Lab/bits.c b/L1-Data-Lab/bits.c
@@ -141,8 +141,6 @@ You are expressly forbidden to:
 int bitAnd(int x, int y) {
     return ~(~x | ~y);
 }
-
-
 /*
  * getByte - Extract byte n from word x
  *   Bytes numbered from 0 (LSB) to 3 (MSB)
@@ -152,14 +150,13 @@ int bitAnd(int x, int y) {
  *   Rating: 2
  */
 int getByte(int x, int n) {
-    int l = (n ^ 0x0011) << 1;
-    return x << l >> l;
+    return (x >> (n << 3)) & 0xFF;
 }
 /*
  * logicalShift - shift x to the right by n, using a logical shift
  *   Can assume that 0 <= n <= 31
  *   Examples: logicalShift(0x87654321,4) = 0x08765432
- *   Legal ops: ~ & ^ | + << >>
+ *   Legal ops: ! ~ & ^ | + << >>
  *   Max ops: 20
  *   Rating: 3
  */

diff --git a/L1-Data-Lab/bits.h b/L1-Data-Lab/bits.h
@@ -1,6 +1,4 @@
 
-
-
 int bitAnd(int, int);
 int test_bitAnd(int, int);
 int getByte(int, int);

diff --git a/L1-Data-Lab/decl.c b/L1-Data-Lab/decl.c
@@ -14,8 +14,6 @@ test_rec test_set[] = {
 
 
 
-
-
  {"bitAnd", (funct_t) bitAnd, (funct_t) test_bitAnd, 2, "| ~", 8, 1,
   {{TMin, TMax},{TMin,TMax},{TMin,TMax}}},
  {"getByte", (funct_t) getByte, (funct_t) test_getByte, 2,

diff --git a/L1-Data-Lab/dlc b/L1-Data-Lab/dlc
diff --git a/Lab-Materials/datalab.pdf b/Lab-Materials/datalab.pdf