update everything to naming conventions agreed upon in class last week

[fleet.git] / tests / dcache / dcache-read.fleet

diff --git a/tests/dcache/dcache-read.fleet b/tests/dcache/dcache-read.fleet
index 7905bcd..d2b5eec 100644 (file)
--- a/tests/dcache/dcache-read.fleet
+++ b/tests/dcache/dcache-read.fleet
@@ -10,31 +10,31 @@
 #ship fifo         : Fifo
 
 // dumb configurations
-debug.data:        [*] take, deliver;
-dscratch.write_addr: [*] take, deliver;
-dscratch.write_data: [*] take, deliver;
-dscratch.read_addr:  [*] take, deliver;
+debug.in:        [*] take, deliver;
+dscratch.inWriteAddr: [*] take, deliver;
+dscratch.inWriteData: [*] take, deliver;
+dscratch.inReadAddr:  [*] take, deliver;
 fifo.in:           [*] take, deliver;
 
 // addresses and values to initialize the dscratch with
-1:  sendto dscratch.write_addr;
-2:  sendto dscratch.write_addr;
-3:  sendto dscratch.write_addr;
-4:  sendto dscratch.write_addr;
-11: sendto dscratch.write_data;
-12: sendto dscratch.write_data;
-13: sendto dscratch.write_data;
-14: sendto dscratch.write_data;
+1:  sendto dscratch.inWriteAddr;
+2:  sendto dscratch.inWriteAddr;
+3:  sendto dscratch.inWriteAddr;
+4:  sendto dscratch.inWriteAddr;
+11: sendto dscratch.inWriteData;
+12: sendto dscratch.inWriteData;
+13: sendto dscratch.inWriteData;
+14: sendto dscratch.inWriteData;
 
 // send write-completion tokens to the fifo output
-dscratch.write_done:
+dscratch.outWriteDone:
   [*] take, sendto fifo.out;
 
 // when the write-completion tokens accumulate, unleash
 // the read addresses
 fifo.out:
   [4] wait;
-  [4] take, sendto dscratch.read_addr;
+  [4] take, sendto dscratch.inReadAddr;
 
 // read addresses
 4:  sendto fifo.in;
@@ -43,6 +43,6 @@ fifo.out:
 1:  sendto fifo.in;
 
 // data read from dscratch goes to the debug ship
-dscratch.read_data:
-  [*] take, sendto debug.data;
+dscratch.outReadData:
+  [*] take, sendto debug.in;