Commit: cb1fb37c3bde68d32f62330c08257e2c9b5461a4 - OSECPU_VM_2 (git)

Commit MetaInfo

• Revisión: cb1fb37c3bde68d32f62330c08257e2c9b5461a4 (tree)
• Tiempo: 2014-06-11 23:40:57
• Autor: hikarupsp <hikarupsp@user...>
• Commiter: hikarupsp

Log Message

modForMac

Cambiar Resumen

• delete: vm/!cons.bat
• add: vm/Makefile
• modified: vm/api.c
• modified: vm/decode.c
• modified: vm/driver.c
• delete: vm/make_vm.bat
• modified: vm/osecpu-vm.h
• add: vm/osecpu.bin
• modified: vm/tek.c

Diferencia incremental

--- a/vm/!cons.bat
+++ /dev/null
@@ -1 +0,0 @@
-%ComSpec%
\ No newline at end of file

--- /dev/null
+++ b/vm/Makefile
@@ -0,0 +1,13 @@
+# for Mac OSX
+CC	= cc
+SRCS	= api.c decode.c driver.c extend.c float.c integer.c osecpu-vm.c other.c pointer.c tek.c
+BINNAME	= osecpu.bin
+DEL	= rm
+CFLAGS	= -x objective-c -Os -m32 -framework Cocoa
+
+$(BINNAME): $(SRCS) Makefile
+	$(CC) $(CFLAGS) -o $@ $(SRCS)
+
+clean:
+	$(DEL) $(BINNAME)
+

--- a/vm/api.c
+++ b/vm/api.c
@@ -18,7 +18,7 @@ void apiEnd(OsecpuVm *vm);
 
 #define BUFFER_SIZE		1024 * 1024	// 1M
 
-int OsecpuMain(int argc, const unsigned char **argv)
+int OsecpuMain(int argc, const char **argv)
 {
 	Defines defs;
 	OsecpuJitc jitc;

--- a/vm/decode.c
+++ b/vm/decode.c
@@ -1,8 +1,6 @@
 #include "osecpu-vm.h"
 
-#include "tek.c"
-
-// typedef unsigned char UCHAR;
+typedef unsigned char UCHAR;
 
 // upx関係.
 

--- a/vm/driver.c
+++ b/vm/driver.c
@@ -4,6 +4,9 @@ void drv_openWin(int x, int y, unsigned char *buf, char *winClosed);
 void drv_flshWin(int sx, int sy, int x0, int y0);
 void drv_sleep(int msec);
 
+int OsecpuMain(int argc, const char **argv);
+
+
 #if (!defined(DRV_OSNUM))
 	#if (defined(_WIN32))
 		#define DRV_OSNUM			0x0001
@@ -424,14 +427,14 @@ NSApplication* app;
 
 @interface Main : NSObject<NSWindowDelegate> {
   int argc;
-  const UCHAR **argv;
+  const char **argv;
   char *winClosed;
   OSECPUView *_view;
 }
 
 - (void)runApp;
 - (void)createThread : (int)_argc
-args : (const UCHAR **)_argv;
+args : (const char **)_argv;
 - (BOOL)windowShouldClose:(id)sender;
 - (void)openWin : (UCHAR *)buf
 sx : (int) sx
@@ -450,7 +453,7 @@ winClosed : (char *)_winClosed;
 }
 
 - (void)createThread : (int)_argc
-  args : (const UCHAR **)_argv
+  args : (const char **)_argv
 {
   argc = _argc;
   argv = _argv;
@@ -491,7 +494,7 @@ winClosed : (char *)_winClosed;
 
 id objc_main;
 
-int main(int argc, const UCHAR **argv)
+int main(int argc, const char **argv)
 {
   objc_main = [[Main alloc] init];
   

--- a/vm/make_vm.bat
+++ /dev/null
@@ -1 +0,0 @@
-c:\mingw\bin\gcc.exe -o osecpu.exe -Os osecpu-vm.c other.c integer.c pointer.c float.c extend.c api.c driver.c decode.c -Wl,-s,-lgdi32
\ No newline at end of file

--- a/vm/osecpu-vm.h
+++ b/vm/osecpu-vm.h
@@ -195,3 +195,6 @@ int decode_upx  (const unsigned char *p, const unsigned char *p1, unsigned char
 int decode_tek5 (const unsigned char *p, const unsigned char *p1, unsigned char *q, unsigned char *q1);
 int decode_fcode(const unsigned char *p, const unsigned char *p1, unsigned char *q, unsigned char *q1);
 
+// api.c
+int OsecpuMain(int argc, const char **argv);
+

Binary files /dev/null and b/vm/osecpu.bin differ

--- a/vm/tek.c
+++ b/vm/tek.c
@@ -45,7 +45,7 @@ int tek_getsize(unsigned char *p)
 
 #endif
 
-int tek_decomp(unsigned char *p, char *q, int size)
+int tek_decomp(unsigned char *p, unsigned char *q, int size)
 {
 	int err = -1;
 #if 0