Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Mon Apr 16 22:00:20 CEST 2007
Subject: [cvs-checkins] MODIFIED: djpeg ...
Date: 00/07/04 16:22:00

Modified: djpeg/testbench jpeg_test.v run.ms
Log:
update




Revision Changes Path
1.2 djpeg/testbench/jpeg_test.v

http://www.opencores.org/cvsweb.shtml/djpeg/testbench/jpeg_test.v.diff?r1=1.1&r2=1.2

(In the diff below, changes in quantity of whitespace are not shown.)

Index: jpeg_test.v
===================================================================
RCS file: /cvsroot/hidemi/djpeg/testbench/jpeg_test.v,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- jpeg_test.v 5 Oct 2006 04:43:38 -0000 1.1
+++ jpeg_test.v 16 Apr 2007 20:00:19 -0000 1.2
@@ -33,7 +33,6 @@
wire [31:0] JPEG_DATA;
reg DATA_ENABLE;
wire READ_ENABLE;
- reg JPEG_START;
wire JPEG_IDLE;

wire OutEnable;
@@ -64,7 +63,6 @@
.DataIn (JPEG_DATA),
.DataInEnable (DATA_ENABLE),
.DataInRead (READ_ENABLE),
- .JpegDecodeStart (JPEG_START),
.JpegDecodeIdle (JPEG_IDLE),

.OutEnable ( OutEnable ),
@@ -115,15 +113,6 @@

assign JPEG_DATA = JPEG_MEM[DATA_COUNT];

- initial begin
- JPEG_START <= 1'b0;
- wait (rst == 1'b1);
- @(posedge clk);
- JPEG_START <= 1'b1;
- @(posedge clk);
- JPEG_START <= 1'b0;
- end
-
integer i;

/*
@@ -333,14 +322,14 @@
if(u_jpeg_decode.OutEnable == 1'b1) begin
address = u_jpeg_decode.OutWidth * u_jpeg_decode.OutPixelY +
u_jpeg_decode.OutPixelX;
-
+ /*
$display(" RGB[%4d,%4d,%4d,%4d](%d): %3x,%3x,%3x = %2x,%2x,%2x",OutPixelX,OutPixelY,u_jpeg_decode.OutWidth,u_jpeg_decode.OutHeight,
address,
u_jpeg_decode.u_jpeg_ycbcr.u_jpeg_ycbcr2rgb.Phase3Y,
u_jpeg_decode.u_jpeg_ycbcr.u_jpeg_ycbcr2rgb.Phase3Cb,
u_jpeg_decode.u_jpeg_ycbcr.u_jpeg_ycbcr2rgb.Phase3Cr,
OutR,OutG,OutB);
-
+ */
rgb_mem[address] = {OutR,OutG,OutB};
end
@(posedge clk);
@@ -349,8 +338,9 @@


initial begin
- while(!(u_jpeg_decode.OutPixelX == u_jpeg_decode.OutWidth -1 & u_jpeg_decode.OutPixelY == u_jpeg_decode.OutHeight -1 & count > 1000)) @(posedge clk);
- @(posedge clk);
+ wait(!JPEG_IDLE);
+ wait(JPEG_IDLE);
+
$display(" End Clock %d",count);
fp = $fopen("sim.dat");
$fwrite(fp,"%0d\n",OutWidth);



1.2 djpeg/testbench/run.ms

http://www.opencores.org/cvsweb.shtml/djpeg/testbench/run.ms.diff?r1=1.1&r2=1.2

(In the diff below, changes in quantity of whitespace are not shown.)

Index: run.ms
===================================================================
RCS file: /cvsroot/hidemi/djpeg/testbench/run.ms,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- run.ms 5 Oct 2006 04:43:38 -0000 1.1
+++ run.ms 16 Apr 2007 20:00:19 -0000 1.2
@@ -5,41 +5,46 @@ exit endif -./convbtoh ../image/$argv[1].jpg test.mem +../c_model/convbtoh ../image/$argv[1].jpg test.mem if(-d ./work) rm -rf work vlib work -vlog ../src/jpeg_regdata.v -vlog ../src/jpeg_ziguzagu_reg.v -vlog ../src/jpeg_ziguzagu.v -vlog ../src/jpeg_dqt.v -vlog ../src/jpeg_dht.v -vlog ../src/jpeg_hm_decode.v -vlog ../src/jpeg_haffuman.v -vlog ../src/jpeg_idctb.v -vlog ../src/jpeg_idctx.v -vlog ../src/jpeg_idcty.v -vlog ../src/jpeg_idct.v -vlog ../src/jpeg_ycbcr_mem.v -vlog ../src/jpeg_ycbcr2rgb.v -vlog ../src/jpeg_ycbcr.v -vlog ../src/jpeg_decode_fsm.v -vlog ../src/jpeg_decode.v -vlog jpeg_test.v +vlog \ +../src/jpeg_regdata.v \ +../src/jpeg_ziguzagu_reg.v \ +../src/jpeg_ziguzagu.v \ +../src/jpeg_dqt.v \ +../src/jpeg_dht.v \ +../src/jpeg_hm_decode.v \ +../src/jpeg_haffuman.v \ +../src/jpeg_idctb.v \ +../src/jpeg_idctx.v \ +../src/jpeg_idcty.v \ +../src/jpeg_idct.v \ +../src/jpeg_ycbcr_mem.v \ +../src/jpeg_ycbcr2rgb.v \ +../src/jpeg_ycbcr.v \ +../src/jpeg_decode_fsm.v \ +../src/jpeg_decode.v \ +jpeg_test.v +#jpeg_test +#-cover \ + +#echo "vsim -coverage -t 1ps -lib work jpeg_test" > modelsim.fdo echo "vsim -t 1ps -lib work jpeg_test" > modelsim.fdo -#echo "view wave" >> modelsim.fdo +echo "view wave" >> modelsim.fdo #echo "do wave.do" >> modelsim.fdo #echo "vcd file vcd/jpeg_test.vcd" >> modelsim.fdo #echo "vcd add -r *" >> modelsim.fdo echo "run 100 ms" >> modelsim.fdo echo "quit" >> modelsim.fdo -vsim -c -do modelsim.fdo -#vsim -do modelsim.fdo +#vsim -c -do modelsim.fdo +vsim -do modelsim.fdo -./convsim sim.dat sim.bmp +../c_model/convsim sim.dat sim.bmp rm -rf ./work rm transcript