Changeset 64 for Deliverables/D4.1/Byte.ml

Timestamp:

Sep 13, 2010, 12:59:27 PM (11 years ago)

Author:

mulligan

Message:

More work on bits, bytes and nibbles.

File:

• Deliverables/D4.1/Byte.ml (modified) (2 diffs)

Deliverables/D4.1/Byte.ml

@@ -30 +30 @@
   val get_bit_at: int -> byte -> bit
   val set_bit_at: int -> bit -> byte -> byte option
+*)
 
   val (-&-): byte -> byte -> byte
   val (-|-): byte -> byte -> byte
   val (-^-): byte -> byte -> byte
+(*
+  val rotate_right: byte -> byte
+  val rotate_left: byte -> byte
+  val shift_right: byte -> byte
+  val shift_left: byte -> byte
+*)
   val not: byte -> byte
 
+(*
   val map_nibble: (nibble -> nibble) -> byte -> byte
   val map_bit: (bit -> bit) -> byte -> byte
@@ -42 +50 @@
   val zip_nibble: (nibble -> nibble -> nibble) -> byte -> byte -> byte
   val zip_bit: (bit -> bit -> bit) -> byte -> byte -> byte
-  val pretty: byte -> string
+  val to_string: byte -> string
 *)
 end
 
-module Byte(Nibble: NIBBLE): BYTE
-  with type bit = Nibble.bit and type nibble = Nibble.nibble =
+module Byte(Bit: BIT) (Nibble: NIBBLE): BYTE
+  with type Nibble.bit = Bit.bit
+  and  type nibble = Nibble.nibble =
 struct
-  type bit = Nibble.bit
+  type bit = Bit.bit
   type nibble = Nibble.nibble
   type byte = nibble * nibble
 
-  let from_bits b1 b2 b3 b4 b5 b6 b7 b8 =
-    let nibble 
+  let (-&-) (l1, l2) (r1, r2) = (Nibble.(-&-) l1 r1, Nibble.(-&-) l2 r2)
+  let (-|-) (l1, l2) (r1, r2) = (Nibble.(-|-) l1 r1, Nibble.(-|-) l2 r2)
+  let (-^-) (l1, l2) (r1, r2) = (Nibble.(-^-) l1 r1, Nibble.(-^-) l2 r2)
+(*
+  let shift_right (n1, n2) =
+    let (b1, b2, b3, b4) = Nibble.to_bits n1 in
+    let (b5, b6, b7, b8) = Nibble.to_bits n2 in
+    let new_n1 = Nibble.from_bits (Bit.from_bool false) b1 b2 b3 in
+    let new_n2 = Nibble.from_bits b4 b5 b6 b7 in
+      (new_n1, new_n2)
+  let shift_left (n1, n2) =
+    let (b1, b2, b3, b4) = Nibble.to_bits n1 in
+    let (b5, b6, b7, b8) = Nibble.to_bits n2 in
+    let new_n1 = Nibble.from_bits b1 b2 b3 b4 in
+    let new_n2 = Nibble.from_bits b5 b6 b7 (Bit.from_bool false) in
+      (new_n1, new_n2)
+  let rotate_right (n1, n2) =
+    let (b1, b2, b3, b4) = Nibble.to_bits n1 in
+    let (b5, b6, b7, b8) = Nibble.to_bits n2 in
+    let new_n1 = Nibble.from_bits b8 b1 b2 b3 in
+    let new_n2 = Nibble.from_bits b4 b5 b6 b7 in
+      (new_n1, new_n2)
+  let rotate_left (n1, n2) =
+    let (b1, b2, b3, b4) = Nibble.to_bits n1 in
+    let (b5, b6, b7, b8) = Nibble.to_bits n2 in
+    let new_n1 = Nibble.from_bits b2 b3 b4 b5 in
+    let new_n2 = Nibble.from_bits b5 b6 b7 b1 in
+      (new_n1, new_n2)
+*)
+  let not (n1, n2) = (Nibble.not n1, Nibble.not n2)
 end