revert to embedded image again.

yoshikiohshima · May 4, 2011 · a8067c0 · a8067c0
1 parent fee9a22
commit a8067c0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 38 deletions.
diff --git a/Makefile b/Makefile
@@ -15,8 +15,7 @@ PYTHON = python
 
 SQCFILES = squeak.c sqUnixMain.c sqNaClWindow.c sqNaClSound.c sqNaClFile.c sqUnixMemory.c sqUnixExternalPrims.c osExports.c
 CROSSCFILES = sqVirtualMachine.c sqNamedPrims.c 
-CFILES = 
-#Etoys.c
+CFILES = Etoys.c
 #INTERP = interp.c
 INTERP = gnu-interp.c
 
@@ -31,7 +30,7 @@ AR = $(NACL_SDK_ROOT)/$(NACL_TOOLCHAIN_DIR)/bin/nacl-ar
 RANLIB = $(NACL_SDK_ROOT)/$(NACL_TOOLCHAIN_DIR)/bin/nacl-ranlib
 
 CFLAGS = -Wall -Wno-long-long -pthread -Werror
-SQCFLAGS = -Wno-long-long -pthread -Wno-pragmas -DNO_STD_FILE_SUPPORT
+SQCFLAGS = -Wno-long-long -pthread -Wno-pragmas -DNO_STD_FILE_SUPPORT -DEMBEDDED_IMAGE_FILE
 INCLUDES = -Isrc/vm -I. -Ivm -ICross/vm
 LDFLAGS = -lppruntime \
           -lpthread \

diff --git a/squeak.html b/squeak.html
@@ -47,21 +47,21 @@
     }
 
       function loadSqueakImage() {
-//	   squeakModule.loadImage();
+	   squeakModule.loadImage();
 
-        var req = new XMLHttpRequest();
-        req.open('GET', 'Etoys2.image', false);
-	req.overrideMimeType('text/plain; charset=x-user-defined');
-        req.send(null);
-        if (req.status == 200) {
-          squeakModule.setImageSize(req.responseText.length.toString());
-          current = 0;
-	  while (current < req.responseText.length) {
-            squeakModule.loadImage(base64_encode(req.responseText.substring(current, current + 3000)));
-	    current = Math.min(current + 3000, req.responseText.length);
-          }
-          req = null;
-        }
+//        var req = new XMLHttpRequest();
+//        req.open('GET', 'Etoys.image', false);
+//	req.overrideMimeType('text/plain; charset=x-user-defined');
+//        req.send(null);
+//        if (req.status == 200) {
+//          squeakModule.setImageSize(req.responseText.length.toString());
+//          current = 0;
+//	  while (current < req.responseText.length) {
+//            squeakModule.loadImage(base64_encode(req.responseText.substring(current, current + 3000)));
+//	    current = Math.min(current + 3000, req.responseText.length);
+//          }
+//          req = null;
+//        }
       }
 
       function moduleDidLoad() {

diff --git a/vm/sqNaClWindow.c b/vm/sqNaClWindow.c
@@ -597,12 +597,10 @@ static void display_printUsage(void)
 
 static void display_printUsageNotes(void)
 {
-  trace();
 }
 
 static void display_parseEnvironment(void)
 {
-  trace();
 }
 
 static int display_parseArgument(int argc, char **argv)

diff --git a/vm/sqUnixMain.c b/vm/sqUnixMain.c
@@ -330,7 +330,6 @@ static void recordFullPathForImageName(const char *localImageName)
 
 sqInt imageNameSize(void)
 {
-  trace();
   return strlen(imageName);
 }
 
@@ -339,7 +338,6 @@ sqInt imageNameGetLength(sqInt sqImageNameIndex, sqInt length)
   char *sqImageName= pointerForOop(sqImageNameIndex);
   int count, i;
 
-  trace();
   count= strlen(imageName);
   count= (length < count) ? length : count;
 
@@ -371,7 +369,6 @@ sqInt imageNamePutLength(sqInt sqImageNameIndex, sqInt length)
 
 char *getImageName(void)
 {
-  trace();
   return imageName;
 }
 
@@ -381,7 +378,6 @@ char *getImageName(void)
 
 sqInt vmPathSize(void)
 {
-  trace();
   return strlen(vmPath);
 }
 
@@ -397,8 +393,6 @@ sqInt vmPathGetLength(sqInt sqVMPathIndex, sqInt length)
   for (i= 0; i < count; i++)
     stVMPath[i]= vmPath[i];
 
-  trace();
-  fprintf(stderr, "count %d\n", (int)count);
   return count;
 }
 
@@ -436,8 +430,6 @@ sqInt ioDisablePowerManager(sqInt disableIfNonZero)
 
 static char *getAttribute(sqInt id)
 {
-  trace();
-  fprintf(stderr, "id %d\n", (int)id);
   if (id < 0)	/* VM argument */
     {
       if (-id  < vmArgCnt)
@@ -1669,7 +1661,6 @@ nacl_fclose(sqImageFile f)
 sqImageFile
 nacl_fopen(char *fileName, char* mode)
 {
-  trace();
   static struct NaClFile nf;
   extern unsigned char *image_file_buffer;
   nf.buffer = image_file_buffer;

diff --git a/vm/squeak.c b/vm/squeak.c
@@ -164,7 +164,11 @@ SetImageSize(struct PP_Var data)
 }
 
 struct PP_Var
+#ifdef EMBEDDED_IMAGE_FILE
+LoadImage()
+#else
 LoadImage(struct PP_Var data)
+#endif
 {
   Log("load image\n");
 #if EMBEDDED_IMAGE_FILE
@@ -191,16 +195,6 @@ Instance_DidCreate(PP_Instance instance,
                                   const char* argn[],
                                   const char* argv[])
 {
-  Log("did create\n");
-#if 0
-    loader = loader_->Create(instance);
-    requestInfo = requestInfo_->Create(instance);
-    requestInfo_->SetProperty(requestInfo, PP_URLREQUESTPROPERTY_URL, StrToVar("http://localhost:5103/squeak/Etoys.image"));
-    requestInfo_->SetProperty(requestInfo, PP_URLREQUESTPROPERTY_METHOD, StrToVar("GET"));
-    loader_->Open(loader, requestInfo, LoadCompletionCallback);
-    Log("loader open\n");
-    return loader ? PP_TRUE : PP_FALSE;
-#endif
   return PP_TRUE;
 }