From 2361ceacd45e388537f00d44c734eeb65650e95c Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Tue, 13 Mar 2007 02:47:18 +0000
Subject: [PATCH] Outgoing socket I/O WebSpide

---
 Robust/src/ClassLibrary/Socket.java        |  2 +-
 Robust/src/ClassLibrary/String.java        | 11 ++++++
 Robust/src/ClassLibrary/StringBuffer.java  |  6 +++
 Robust/src/IR/Flat/BuildCode.java          | 45 +++++++++++++++-------
 Robust/src/IR/Flat/BuildFlat.java          | 16 +++++---
 Robust/src/IR/Flat/FlatFlagActionNode.java |  4 ++
 Robust/src/IR/Flat/FlatLiteralNode.java    |  2 +-
 Robust/src/IR/Flat/TempFlagPair.java       |  5 ++-
 Robust/src/IR/Tree/BuildIR.java            |  2 +-
 Robust/src/IR/Tree/SemanticCheck.java      |  2 +-
 Robust/src/Main/Main.java                  |  9 ++++-
 Robust/src/Parse/java14.cup                |  4 +-
 Robust/src/Runtime/runtime.c               | 13 ++++++-
 Robust/src/Runtime/runtime.h               |  6 ++-
 Robust/src/Runtime/socket.c                | 28 ++++++++------
 15 files changed, 113 insertions(+), 42 deletions(-)

diff --git a/Robust/src/ClassLibrary/Socket.java b/Robust/src/ClassLibrary/Socket.java
index ddfc8a9b..72b76f64 100644
--- a/Robust/src/ClassLibrary/Socket.java
+++ b/Robust/src/ClassLibrary/Socket.java
@@ -20,7 +20,7 @@ public class Socket {
 
     public static native int nativeBind(byte[] address, int port);
 
-    public static native int nativeConnect(int fd, byte[] address, int port);
+    public native int nativeConnect(int fd, byte[] address, int port);
     
     int setFD(int filed) {
 	fd=filed;
diff --git a/Robust/src/ClassLibrary/String.java b/Robust/src/ClassLibrary/String.java
index 95d85b22..13798ff0 100644
--- a/Robust/src/ClassLibrary/String.java
+++ b/Robust/src/ClassLibrary/String.java
@@ -54,6 +54,17 @@ public class String {
 	return this.subString(beginIndex, this.count);
     }
 
+    public int lastindexOf(int ch) {
+	return this.lastindexOf(ch, count - 1);
+    }
+
+    public int lastindexOf(int ch, int fromIndex) {
+	for(int i=fromIndex;i>0;i--)
+	    if (this.charAt(i)==ch)
+		return i;
+	return -1;
+    }
+
     public int indexOf(int ch) {
 	return this.indexOf(ch, 0);
     }
diff --git a/Robust/src/ClassLibrary/StringBuffer.java b/Robust/src/ClassLibrary/StringBuffer.java
index b06fd706..02bb8a36 100644
--- a/Robust/src/ClassLibrary/StringBuffer.java
+++ b/Robust/src/ClassLibrary/StringBuffer.java
@@ -12,6 +12,12 @@ public class StringBuffer {
 	    value[i]=str.value[i+str.offset];
     }
 
+    public StringBuffer() {
+	value=new char[16];//16 is DEFAULTSIZE
+	count=0;
+	offset=0;
+    }
+
     public int length() {
 	return count;
     }
diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index c471cb2f..cd726b7e 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -1407,22 +1407,31 @@ public class BuildCode {
 	    TempDescriptor temp=tfp.getTemp();
 	    Hashtable flagtable=(Hashtable)flagorder.get(temp.getType().getClassDesc());
 	    FlagDescriptor flag=tfp.getFlag();
-	    int flagid=1<<((Integer)flagtable.get(flag)).intValue();
-	    boolean flagstatus=ffan.getFlagChange(tfp);
-	    if (flagstatus) {
-		int mask=0;
+	    if (flag==null) {
+		//Newly allocate objects that don't set any flags case
 		if (flagortable.containsKey(temp)) {
-		    mask=((Integer)flagortable.get(temp)).intValue();
+		    throw new Error();
 		}
-		mask|=flagid;
+		int mask=0;
 		flagortable.put(temp,new Integer(mask));
 	    } else {
-		int mask=0xFFFFFFFF;
-		if (flagandtable.containsKey(temp)) {
-		    mask=((Integer)flagandtable.get(temp)).intValue();
+		int flagid=1<<((Integer)flagtable.get(flag)).intValue();
+		boolean flagstatus=ffan.getFlagChange(tfp);
+		if (flagstatus) {
+		    int mask=0;
+		    if (flagortable.containsKey(temp)) {
+			mask=((Integer)flagortable.get(temp)).intValue();
+		    }
+		    mask|=flagid;
+		    flagortable.put(temp,new Integer(mask));
+		} else {
+		    int mask=0xFFFFFFFF;
+		    if (flagandtable.containsKey(temp)) {
+			mask=((Integer)flagandtable.get(temp)).intValue();
+		    }
+		    mask&=(0xFFFFFFFF^flagid);
+		    flagandtable.put(temp,new Integer(mask));
 		}
-		mask&=(0xFFFFFFFF^flagid);
-		flagandtable.put(temp,new Integer(mask));
 	    }
 	}
 	Iterator orit=flagortable.keySet().iterator();
@@ -1432,14 +1441,22 @@ public class BuildCode {
 	    int andmask=0xFFFFFFF;
 	    if (flagandtable.containsKey(temp))
 		andmask=((Integer)flagandtable.get(temp)).intValue();
-	    output.println("flagorand("+generateTemp(fm, temp)+", 0x"+Integer.toHexString(ormask)+", 0x"+Integer.toHexString(andmask)+");");
+	    if (ffan.getTaskType()==FlatFlagActionNode.NEWOBJECT) {
+		output.println("flagorandinit("+generateTemp(fm, temp)+", 0x"+Integer.toHexString(ormask)+", 0x"+Integer.toHexString(andmask)+");");
+	    } else {
+		output.println("flagorand("+generateTemp(fm, temp)+", 0x"+Integer.toHexString(ormask)+", 0x"+Integer.toHexString(andmask)+");");
+	    }
 	}
 	Iterator andit=flagandtable.keySet().iterator();
 	while(andit.hasNext()) {
 	    TempDescriptor temp=(TempDescriptor)andit.next();
 	    int andmask=((Integer)flagandtable.get(temp)).intValue();
-	    if (!flagortable.containsKey(temp))
-		output.println("flagorand("+generateTemp(fm, temp)+", 0, 0x"+Integer.toHexString(andmask)+");");
+	    if (!flagortable.containsKey(temp)) {
+		if (ffan.getTaskType()==FlatFlagActionNode.NEWOBJECT)
+		    output.println("flagorandinit("+generateTemp(fm, temp)+", 0, 0x"+Integer.toHexString(andmask)+");");
+		else
+		    output.println("flagorand("+generateTemp(fm, temp)+", 0, 0x"+Integer.toHexString(andmask)+");");
+	    }
 	}
     }
 }
diff --git a/Robust/src/IR/Flat/BuildFlat.java b/Robust/src/IR/Flat/BuildFlat.java
index bce8e4ca..f487915e 100644
--- a/Robust/src/IR/Flat/BuildFlat.java
+++ b/Robust/src/IR/Flat/BuildFlat.java
@@ -144,15 +144,19 @@ public class BuildFlat {
 	    FlatNew fn=new FlatNew(td, out_temp);
 	    TempDescriptor[] temps=new TempDescriptor[con.numArgs()];
 	    FlatNode last=fn;
-
-	    if (con.getFlagEffects()!=null) {
+	    if (td.getClassDesc().hasFlags()) {
+		//	    if (con.getFlagEffects()!=null) {
 		FlatFlagActionNode ffan=new FlatFlagActionNode(FlatFlagActionNode.NEWOBJECT);
 		FlagEffects fes=con.getFlagEffects();
 		TempDescriptor flagtemp=out_temp;
-		for(int j=0;j<fes.numEffects();j++) {
-		    FlagEffect fe=fes.getEffect(j);
-		    ffan.addFlagAction(flagtemp, fe.getFlag(), fe.getStatus());
-		}
+		if (fes!=null)
+		    for(int j=0;j<fes.numEffects();j++) {
+			FlagEffect fe=fes.getEffect(j);
+			ffan.addFlagAction(flagtemp, fe.getFlag(), fe.getStatus());
+		    } else {
+			ffan.addFlagAction(flagtemp, null, false);
+		    }
+		
 		last.addNext(ffan);
 		last=ffan;
 	    }
diff --git a/Robust/src/IR/Flat/FlatFlagActionNode.java b/Robust/src/IR/Flat/FlatFlagActionNode.java
index 3e52f598..f546517b 100644
--- a/Robust/src/IR/Flat/FlatFlagActionNode.java
+++ b/Robust/src/IR/Flat/FlatFlagActionNode.java
@@ -17,6 +17,10 @@ public class FlatFlagActionNode extends FlatNode {
 	this.taskexit=taskexit;
     }
 
+    public int getTaskType() {
+	return taskexit;
+    }
+
     public void addFlagAction(TempDescriptor td, FlagDescriptor fd, boolean status) {
 	TempFlagPair tfp=new TempFlagPair(td,fd);
 	if (tempflagpairs.containsKey(tfp)) {
diff --git a/Robust/src/IR/Flat/FlatLiteralNode.java b/Robust/src/IR/Flat/FlatLiteralNode.java
index 60595435..93b814b4 100644
--- a/Robust/src/IR/Flat/FlatLiteralNode.java
+++ b/Robust/src/IR/Flat/FlatLiteralNode.java
@@ -39,7 +39,7 @@ public class FlatLiteralNode extends FlatNode {
 	    else if (x=='\r')
 		new_st+="\\r";
 	    else if (x=='"')
-		new_st+="'"+'"'+"'";
+		new_st+="\\\"";
 	    else new_st+=x;
 	}
 	return new_st;
diff --git a/Robust/src/IR/Flat/TempFlagPair.java b/Robust/src/IR/Flat/TempFlagPair.java
index 81edcefc..21915d2c 100644
--- a/Robust/src/IR/Flat/TempFlagPair.java
+++ b/Robust/src/IR/Flat/TempFlagPair.java
@@ -10,7 +10,10 @@ public class TempFlagPair {
 	this.td=td;
     }
     public int hashCode() {
-	return fd.hashCode()^td.hashCode();
+	if (fd!=null)
+	    return fd.hashCode()^td.hashCode();
+	else
+	    return td.hashCode();
     }
 
     public TempDescriptor getTemp() {
diff --git a/Robust/src/IR/Tree/BuildIR.java b/Robust/src/IR/Tree/BuildIR.java
index fbea5fce..f2525acd 100644
--- a/Robust/src/IR/Tree/BuildIR.java
+++ b/Robust/src/IR/Tree/BuildIR.java
@@ -595,7 +595,7 @@ public class BuildIR {
 	    ExpressionNode condition=parseExpression(pn.getChild("condition").getFirstChild());
 	    BlockNode body=parseSingleBlock(pn.getChild("statement").getFirstChild());
 	    blockstatements.add(new LoopNode(condition,body,LoopNode.DOWHILELOOP));
-   	} else {
+	} else {
 	    System.out.println("---------------");
 	    System.out.println(pn.PPrint(3,true));
 	    throw new Error();
diff --git a/Robust/src/IR/Tree/SemanticCheck.java b/Robust/src/IR/Tree/SemanticCheck.java
index 5cd747f7..e8fb8899 100644
--- a/Robust/src/IR/Tree/SemanticCheck.java
+++ b/Robust/src/IR/Tree/SemanticCheck.java
@@ -367,7 +367,7 @@ public class SemanticCheck {
 	else
 	    fd=(FieldDescriptor) ltd.getClassDesc().getFieldTable().get(fieldname);
 	if (fd==null)
-	    throw new Error("Unknown field "+fieldname);
+	    throw new Error("Unknown field "+fieldname + " in "+fan.printNode(0));
 	fan.setField(fd);
 	if (td!=null)
 	    if (!typeutil.isSuperorType(td,fan.getType()))
diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 4afed256..2b63b41c 100644
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -109,7 +109,14 @@ public class Main {
 	Lex.Lexer l = new Lex.Lexer(fr);
 	java_cup.runtime.lr_parser g;
 	g = new Parse.Parser(l);
-	ParseNode p=(ParseNode) g./*debug_*/parse().value;
+	ParseNode p=null;
+	try {
+	    p=(ParseNode) g./*debug_*/parse().value;
+	} catch (Exception e) {
+	    System.err.println("Error parsing file:"+sourcefile);
+	    e.printStackTrace();
+	    System.exit(-1);
+	}
 	state.addParseNode(p);
 	if (l.numErrors()!=0) {
 	    System.out.println("Error parsing "+sourcefile);
diff --git a/Robust/src/Parse/java14.cup b/Robust/src/Parse/java14.cup
index 68773750..6d200855 100644
--- a/Robust/src/Parse/java14.cup
+++ b/Robust/src/Parse/java14.cup
@@ -368,7 +368,9 @@ flag_effect ::= IDENTIFIER:id LBRACE flag_list:fl RBRACE {:
 	:};
 
 flag_list_opt ::= LBRACE flag_list:fl RBRACE {:RESULT=fl;:}
-	| {: RESULT = new ParseNode("empty"); :}
+	| LBRACE RBRACE {: RESULT = new ParseNode("empty"); :}	
+	| 
+	{: RESULT = new ParseNode("empty"); :}
 	;
 
 flag_list ::= flag_change:fc {: 
diff --git a/Robust/src/Runtime/runtime.c b/Robust/src/Runtime/runtime.c
index cf8a64ea..7a7de465 100644
--- a/Robust/src/Runtime/runtime.c
+++ b/Robust/src/Runtime/runtime.c
@@ -124,11 +124,22 @@ int comparetpd(struct taskparamdescriptor *ftd1, struct taskparamdescriptor *ftd
 
 void flagorand(void * ptr, int ormask, int andmask) {
   int oldflag=((int *)ptr)[1];
-  struct RuntimeHash *flagptr=(struct RuntimeHash *)(((int*)ptr)[2]);
   int flag=ormask|oldflag;
   flag&=andmask;
   if (flag==oldflag) /* Don't do anything */
     return;
+  else flagbody(ptr, flag);
+}
+
+void flagorandinit(void * ptr, int ormask, int andmask) {
+  int oldflag=((int *)ptr)[1];
+  int flag=ormask|oldflag;
+  flag&=andmask;
+  flagbody(ptr,flag);
+}
+
+void flagbody(void *ptr, int flag) {
+  struct RuntimeHash *flagptr=(struct RuntimeHash *)(((int*)ptr)[2]);
   ((int*)ptr)[1]=flag;
 
   /*Remove object from all queues */
diff --git a/Robust/src/Runtime/runtime.h b/Robust/src/Runtime/runtime.h
index 5dd0fe6c..3141f83c 100644
--- a/Robust/src/Runtime/runtime.h
+++ b/Robust/src/Runtime/runtime.h
@@ -29,8 +29,8 @@ void createstartupobject();
 #define CALL02(name, alt1, alt2) name(struct name ## _params * ___params___)
 #define CALL11(name,rest, alt) name(struct name ## _params * ___params___, rest)
 #define CALL12(name,rest, alt1, alt2) name(struct name ## _params * ___params___, rest)
-#define CALL21(name,rest, rest2, alt) name(struct name ## _params * ___params___, rest, rest2)
 #define CALL23(name, rest, rest2, alt1, alt2, alt3) name(struct name ## _params * ___params___, rest, rest2)
+#define CALL24(name, rest, rest2, alt1, alt2, alt3, alt4) name(struct name ## _params * ___params___, rest, rest2)
 #else
 #define VAR(name) name
 #define CALL00(name) name()
@@ -38,14 +38,16 @@ void createstartupobject();
 #define CALL02(name, alt1, alt2) name(alt1, alt2)
 #define CALL11(name,rest, alt) name(alt)
 #define CALL12(name,rest, alt1, alt2) name(alt1, alt2)
-#define CALL21(name,rest, rest2, alt) name(alt)
 #define CALL23(name, rest, rest2, alt1, alt2, alt3) name(alt1, alt2, alt3)
+#define CALL24(name, rest, rest2, alt1, alt2, alt3, alt4) name(alt1, alt2, alt3, alt4)
 #endif
 
 #ifdef TASK
 #include "SimpleHash.h"
 #include "task.h"
 void flagorand(void * ptr, int ormask, int andmask);
+void flagorandinit(void * ptr, int ormask, int andmask);
+void flagbody(void *ptr, int flag);
 void executetasks();
 void processtasks();
 
diff --git a/Robust/src/Runtime/socket.c b/Robust/src/Runtime/socket.c
index 17e189c6..360db132 100644
--- a/Robust/src/Runtime/socket.c
+++ b/Robust/src/Runtime/socket.c
@@ -11,19 +11,28 @@
 
 extern struct RuntimeHash *fdtoobject;
 
-int CALL23(___Socket______nativeConnect____I__AR_B_I, int ___fd___, int ___port___, int ___fd___, struct ArrayObject * ___address___ ,int ___port___) {
+int CALL24(___Socket______nativeConnect____I__AR_B_I, int ___fd___, int ___port___, struct ___Socket___ * ___this___, int ___fd___, struct ArrayObject * ___address___ ,int ___port___) {
   struct sockaddr_in sin;
   int rc;
   
   bzero(&sin, sizeof(sin));
   sin.sin_family= AF_INET;
   sin.sin_port=htons(___port___);
-  sin.sin_addr.s_addr=htonl(*(((char *)&VAR(___address___)->___length___)+sizeof(int)));
+  sin.sin_addr.s_addr=htonl(*(int *)(((char *)&VAR(___address___)->___length___)+sizeof(int)));
   do {
     rc = connect(___fd___, (struct sockaddr *) &sin, sizeof(sin));
   } while (rc<0 && errno==EINTR); /* repeat if interrupted */
   
   if (rc<0) goto error;
+
+#ifdef TASK
+  //Make non-blocking
+  fcntl(___fd___, F_SETFD, 1);
+  fcntl(___fd___, F_SETFL, fcntl(___fd___, F_GETFL)|O_NONBLOCK);
+  RuntimeHashadd(fdtoobject, ___fd___, (int) VAR(___this___));
+  addreadfd(___fd___);
+#endif
+
   return 0;
   
  error:
@@ -39,8 +48,8 @@ int CALL12(___Socket______nativeBind_____AR_B_I, int ___port___,  struct ArrayOb
   struct sockaddr_in sin;
   bzero(&sin, sizeof(sin));
   sin.sin_family= AF_INET;
-  sin.sin_port=htons(___port___);
-  sin.sin_addr.s_addr=htonl(*(((char *) &VAR(___address___)->___length___)+sizeof(int)));
+  sin.sin_port=0;
+  sin.sin_addr.s_addr=INADDR_ANY;
   
   fd=socket(AF_INET, SOCK_STREAM, 0);
   if (fd<0) {
@@ -59,12 +68,6 @@ int CALL12(___Socket______nativeBind_____AR_B_I, int ___port___,  struct ArrayOb
 #endif
   }
   
-#ifdef TASK
-  //Make non-blocking
-  fcntl(fd, F_SETFD, 1);
-  fcntl(fd, F_SETFL, fcntl(fd, F_GETFL)|O_NONBLOCK);
-#endif
-
   rc = bind(fd, (struct sockaddr *) &sin, sizeof(sin));
   if (rc<0) goto error;
 
@@ -124,8 +127,9 @@ struct ArrayObject * CALL01(___InetAddress______getHostByName_____AR_B, struct _
     bytearray=allocate_newarray(BYTEARRAYTYPE,h->h_length);
 #endif
     ((void **)&((&arraybytearray->___length___)[1]))[i]=bytearray;
-    for(j=0;j<h->h_length;j++) {
-      ((char *)&((&bytearray->___length___)[1]))[j]=h->h_addr_list[i][j];
+    {
+      int ha=ntohl(*(int *)h->h_addr_list[i]);
+      (&bytearray->___length___)[1]=ha;
     }
   }
   
-- 
2.34.1