From: adam Date: Sat, 11 Aug 2007 05:01:54 +0000 (+0100) Subject: use non-blocking assignment for onread/onwrite X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=17c779c7b7b2a66b88d245ebe8deff119e356bfb;p=fleet.git use non-blocking assignment for onread/onwrite --- diff --git a/src/edu/berkeley/fleet/slipway/macros.v b/src/edu/berkeley/fleet/slipway/macros.v index fe214d0..0f54310 100644 --- a/src/edu/berkeley/fleet/slipway/macros.v +++ b/src/edu/berkeley/fleet/slipway/macros.v @@ -30,10 +30,10 @@ `define input(r, a, a_, w, d) input r; output a_; reg a; assign a_=a; input w d; initial a=0; `define output(r, r_, a, w, d) output r_; input a; reg r; assign r_=r; output w d; initial r=0; -`define onread(req, ack) if (!req && ack) ack=0; else if (req && !ack) begin ack=1; -`define onwrite(req, ack) if (!req && !ack) req = 1; else if (req && ack) begin req = 0; -//`define onread2(req, ack) if (!req && ack) ack<=0; else if (req && !ack) begin ack<=1; +`define onread(req, ack) if (!req && ack) ack <= 0; else if (req && !ack) begin ack <=1; +`define onwrite(req, ack) if (!req && !ack) req <= 1; else if (req && ack) begin req <= 0; +//`define onread2(req, ack) if (!req && ack) ack<=0; else if (req && !ack) begin ack<=1; //`define onwrite2(req, ack) if (req && ack) begin req <= 0; `define onread2(req, ack) if (req && !ack) begin ack = 1;