Message

Reply | Reply all

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

From: cvs at opencores.org<cvs@o...>
Date: Sun Jun 25 00:11:01 CEST 2006
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/06/06 25:00:11

Modified: jop/java/target/src/bench/jbe/ejip TcpIp.java Udp.java
Log:
no message


Revision Changes Path
1.2 jop/java/target/src/bench/jbe/ejip/TcpIp.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/bench/jbe/ejip/TcpIp.java.diff?r1=1.1&r2=1.2

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

Index: TcpIp.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/bench/jbe/ejip/TcpIp.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TcpIp.java 10 Sep 2004 08:52:59 -0000 1.1
+++ TcpIp.java 24 Jun 2006 22:11:00 -0000 1.2
@@ -78,7 +78,7 @@
int i;
int sum = 0;
cnt = (cnt+3)>>2; // word count
- while (cnt != 0) {
+ while (cnt != 0) { // @WCA loop<=1500
i = buf[off];
sum += i & 0xffff;
sum += i>>>16;
@@ -86,7 +86,9 @@
--cnt;
}

- while ((sum>>16) != 0) sum = (sum & 0xffff) + (sum >> 16);
+ while ((sum>>16) != 0) { // @WCA loop<=2
+ sum = (sum & 0xffff) + (sum >> 16);
+ }

sum = (~sum) & 0xffff;




1.2 jop/java/target/src/bench/jbe/ejip/Udp.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/bench/jbe/ejip/Udp.java.diff?r1=1.1&r2=1.2

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

Index: Udp.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/bench/jbe/ejip/Udp.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Udp.java 10 Sep 2004 08:52:59 -0000 1.1
+++ Udp.java 24 Jun 2006 22:11:00 -0000 1.2
@@ -121,11 +121,11 @@

buf[2] = (PROTOCOL<<16) + p.len - 20; // set protocol and udp length in iph checksum for tcp checksum
if (TcpIp.chkSum(buf, 2, p.len-8)!=0) {
- Dbg.intVal(p.len);
- Dbg.wr(" : ");
- for (int k = 0; k < (p.len+3)/4; k++) {
- Dbg.hexVal(buf[k]);
- }
+// Dbg.intVal(p.len);
+// Dbg.wr(" : ");
+// for (int k = 0; k < (p.len+3)/4; k++) {
+// Dbg.hexVal(buf[k]);
+// }
p.setStatus(Packet.FREE); // mark packet free
Dbg.wr("wrong UDP checksum ");
return;
@@ -142,7 +142,7 @@
} else {

if (list!=null) {
- for (i=0; i<MAX_HANDLER; ++i) {
+ for (i=0; i<MAX_HANDLER; ++i) { // @WCA loop=8
if (list[i]!=null && ports[i]==port) {
list[i].request(p);
break;
@@ -165,7 +165,7 @@

int[] buf = p.buf;
s.setLength(0);
- for (int i = Udp.DATA*4; i < p.len; i++) {
+ for (int i = Udp.DATA*4; i < p.len; i++) { // @WCA loop<=1500
s.append((char) ((buf[i>>2]>>(24 - ((i&3)<<3))) & 0xff));
}
}
@@ -176,8 +176,8 @@
int cnt = s.length();
// copy buffer
int k = 0;
- for (int i=0; i<cnt; i+=4) {
- for (int j=0; j<4; ++j) {
+ for (int i=0; i<cnt; i+=4) { // @WCA loop<=1500
+ for (int j=0; j<4; ++j) { // @WCA loop=4
k <<= 8; if (i+j < cnt) k += s.charAt(i+j); } @@ -218,11 +218,11 @@ int[] buf = p.buf; // read ethernet header from CS8900 driver -/* - for (i=0; i<7; ++i) { - p.llh[i] = CS8900.llh[i]; - } -*/ + +// for (i=0; i<7; ++i) { +// p.llh[i] = CS8900.llh[i]; +// } + // IP header // TODO unique id for sent packet buf[0] = 0x45000000 + p.len; // ip length (header without options)