Changeset 62 for Deliverables/D4.1/Nibble.ml

Timestamp:

Sep 10, 2010, 5:37:19 PM (11 years ago)

Author:

mulligan

Message:

Many additions to Bit, Nibble and Byte API, as well as more instructions
added to ASMInterpret execute function.

File:

• Deliverables/D4.1/Nibble.ml (modified) (4 diffs)

Deliverables/D4.1/Nibble.ml

@@ +1 @@
+(*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*)
+(* FILENAME: Nibble.ml                                                       *)
+(* DESCRIPTION: An ADT implementing nibbles, and common operations on them.  *)
+(* CREATED: 10/09/2010, Dominic Mulligan                                     *)
+(* BUGS:                                                                     *)
+(*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*)
+
 open Bit;;
 
-module type NIBBLE = functor(Bit: BIT) ->
+module type NIBBLE =
 sig
-  type bit = Bit.bit
+  type bit
   type nibble
 
   val from_bits: bit -> bit -> nibble
+  val from_int: int -> nibble option
 
-  val upper_bit: nibble -> bit
-  val lower_bit: nibble -> bit
+  val get_bit_at: int -> nibble -> bit option
+  val set_bit_at: int -> bit -> nibble -> nibble option
 
   val (-&-): nibble -> nibble -> nibble
@@ -16 +24 @@
   val not: nibble -> nibble
 
-  val swap: nibble -> nibble
+  val swap_bits: nibble -> nibble
 
-  val mask: (bit -> bit) -> nibble -> nibble
-  val zip: (bit -> bit -> bit) -> nibble -> nibble -> nibble
+  val map_bit: (bit -> bit) -> nibble -> nibble
+  val iter_bit: (bit -> string) -> nibble -> string
+  val zip_bit: (bit -> bit -> bit) -> nibble -> nibble -> nibble
+  val pretty: nibble -> string
 end
 
-module NibbleFunctor: NIBBLE = functor(Bit: BIT) ->
+module NibbleFunctor(Bit: BIT) : NIBBLE with type bit = Bit.bit =
 struct
   type bit = Bit.bit
@@ -28 +38 @@
 
   let from_bits l h = (l, h)
+  let from_int int_val =
+    match int_val with
+      0 -> Some (Bit.from_int 0, Bit.from_int 0)
+    | 1 -> Some (Bit.from_int 0, Bit.from_int 1)
+    | 2 -> Some (Bit.from_int 1, Bit.from_int 0)
+    | 3 -> Some (Bit.from_int 1, Bit.from_int 1)
+    | _ -> None
 
-  let upper_bit (l, r) = r
-  let lower_bit (l, r) = l
+  let get_bit_at index (l, h) =
+    if index = 0 then
+      Some l
+    else if index = 1 then
+      Some h
+    else
+      None
+
+  let set_bit_at index new_bit (l, h) =
+    if index = 0 then
+      Some (new_bit, h)
+    else if index = 1 then
+      Some (l, new_bit)
+    else
+      None
 
   let (-&-) (l1,h1) (l2, h2) =
@@ -41 +71 @@
   let not (l, h) = (Bit.not l, Bit.not h)
 
-  let swap (l, h) = (h, l)
+  let swap_bits (l, h) = (h, l)
 
-  let mask f (l, h) = (f l, f h)
-  let zip f (l1, h1) (l2, h2) = (f l1 l2, f l2 h2)
+  let map_bit f (l, h) = (f l, f h)
+  let iter_bit f (l, h) =
+    let str_l = f l in
+    let str_h = f h in
+      str_l ^ str_h
+  let zip_bit f (l1, h1) (l2, h2) = (f l1 l2, f l2 h2)
+  let pretty = iter_bit Bit.pretty
 end
+
+module Nibble = NibbleFunctor(Bit)