Message

Reply | Reply all

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

From: OpenCores CVS Agent<cvs@o...>
Date: Thu Jan 20 19:15:35 CET 2005
Subject: [cvs-checkins] MODIFIED: systemcaes ...
Date: 00/05/01 20:19:15

Modified: systemcaes/rtl/systemc aes.h word_mixcolum.cpp
word_mixcolum.h
Log:
Style changes to fit sc2v




Revision Changes Path
1.4 +4 -2 systemcaes/rtl/systemc/aes.h

http://www.opencores.org/cvsweb.shtml/systemcaes/rtl/systemc/aes.h.diff?r1=1.3&r2=1.4

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

Index: aes.h
===================================================================
RCS file: /cvsroot/jcastillo/systemcaes/rtl/systemc/aes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- aes.h 30 Aug 2004 14:47:18 -0000 1.3
+++ aes.h 20 Jan 2005 18:14:05 -0000 1.4
@@ -43,6 +43,9 @@
// CVS Revision History
//
// $Log: aes.h,v $
+// Revision 1.4 2005/01/20 18:14:05 jcastillo
+// Style changes to fit sc2v
+//
// Revision 1.3 2004/08/30 14:47:18 jcastillo
// aes.h style correction
//
@@ -119,7 +122,6 @@
sc_signal<sc_uint<4> > addroundkey_round, next_addroundkey_round;

sc_signal<bool> first_round_reg, next_first_round_reg;
- int state_var;

void registers();
void control();



1.3 +80 -50 systemcaes/rtl/systemc/word_mixcolum.cpp

http://www.opencores.org/cvsweb.shtml/systemcaes/rtl/systemc/word_mixcolum.cpp.diff?r1=1.2&r2=1.3

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

Index: word_mixcolum.cpp
===================================================================
RCS file: /cvsroot/jcastillo/systemcaes/rtl/systemc/word_mixcolum.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- word_mixcolum.cpp 30 Aug 2004 14:44:44 -0000 1.2
+++ word_mixcolum.cpp 20 Jan 2005 18:14:06 -0000 1.3
@@ -43,6 +43,9 @@
// CVS Revision History
//
// $Log: word_mixcolum.cpp,v $
+// Revision 1.3 2005/01/20 18:14:06 jcastillo
+// Style changes to fit sc2v
+//
// Revision 1.2 2004/08/30 14:44:44 jcastillo
// Code Formater used to give better appearance to SystemC code
//
@@ -51,3 +54,30 @@
//

#include "word_mixcolum.h"
+
+void word_mixcolum::mix(){
+ sc_uint<32> outx_var, outy_var;
+
+ outx_var.range(31, 24) = x1.read();
+ outx_var.range(23, 16) = x2.read();
+ outx_var.range(15, 8) = x3.read();
+ outx_var.range(7, 0) = x4.read();
+ outy_var.range(31, 24) = y1.read();
+ outy_var.range(23, 16) = y2.read();
+ outy_var.range(15, 8) = y3.read();
+ outy_var.range(7, 0) = y4.read();
+
+ outx.write(outx_var);
+ outy.write(outy_var);
+}
+
+void word_mixcolum::split()
+{
+ sc_uint<32> in_var;
+
+ in_var = in.read();
+ a.write(in_var.range(31, 24));
+ b.write(in_var.range(23, 16));
+ c.write(in_var.range(15, 8));
+ d.write(in_var.range(7, 0));
+}

1.3 +113 -135 systemcaes/rtl/systemc/word_mixcolum.h http://www.opencores.org/cvsweb.shtml/systemcaes/rtl/systemc/word_mixcolum.h.diff?r1=1.2&r2=1.3 (In the diff below, changes in quantity of whitespace are not shown.) Index: word_mixcolum.h =================================================================== RCS file: /cvsroot/jcastillo/systemcaes/rtl/systemc/word_mixcolum.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- word_mixcolum.h 30 Aug 2004 14:44:44 -0000 1.2 +++ word_mixcolum.h 20 Jan 2005 18:14:06 -0000 1.3 @@ -43,6 +43,9 @@ // CVS Revision History // // $Log: word_mixcolum.h,v $ +// Revision 1.3 2005/01/20 18:14:06 jcastillo +// Style changes to fit sc2v +// // Revision 1.2 2004/08/30 14:44:44 jcastillo // Code Formater used to give better appearance to SystemC code // @@ -62,33 +65,8 @@ sc_signal<sc_uint<8> > a, b, c, d; sc_signal<sc_uint<8> > x1, x2, x3, x4, y1, y2, y3, y4; - void split() - { - sc_uint<32> in_var; - - in_var = in.read(); - a.write(in_var.range(31, 24)); - b.write(in_var.range(23, 16)); - c.write(in_var.range(15, 8)); - d.write(in_var.range(7, 0)); - } - - void mix() - { - sc_uint<32> outx_var, outy_var; - - outx_var.range(31, 24) = x1.read(); - outx_var.range(23, 16) = x2.read(); - outx_var.range(15, 8) = x3.read(); - outx_var.range(7, 0) = x4.read(); - outy_var.range(31, 24) = y1.read(); - outy_var.range(23, 16) = y2.read(); - outy_var.range(15, 8) = y3.read(); - outy_var.range(7, 0) = y4.read(); - - outx.write(outx_var); - outy.write(outy_var); - } + void split(); + void mix(); byte_mixcolum *bm1; byte_mixcolum *bm2;