Add Xbox One port.

diff --git a/doc/install.html b/doc/install.html
index 008721f075a9e2e2d19875eb7be7d0cd15a7e51c..b5df697b6709cf6869cbde799b60df3878bb6d1f 100644 (file)
--- a/doc/install.html
+++ b/doc/install.html
@@ -124,7 +124,7 @@ operating systems, CPUs and compilers:
 <td class="compatos">GCC 4.x</td>
 <td class="compatos">ORBIS (<a href="#ps4">PS4</a>)</td>
 <td class="compatos">GCC 4.x</td>
-<td class="compatos">MSVC + SDK v7.0<br>WinSDK v7.0</td>
+<td class="compatos">MSVC + SDK v7.0<br>WinSDK v7.0<br>Durango (<a href="#xboxone">Xbox One</a>)</td>
 </tr>
 <tr class="odd">
 <td class="compatcpu"><a href="#cross2">ARMv5+<br>ARM9E+</a></td>
@@ -516,6 +516,16 @@ the following commands:
 cd src
 xedkbuild
 </pre>
+<p>
+To cross-compile for <b id="xboxone">Xbox One</b> from a Windows host,
+open a "Visual Studio .NET Command Prompt" (64&nbsp;bit host compiler),
+<tt>cd</tt> to the directory where you've unpacked the sources and run
+the following commands:
+</p>
+<pre class="code">
+cd src
+xb1build
+</pre>
 
 <h2 id="embed">Embedding LuaJIT</h2>
 <p>

diff --git a/doc/luajit.html b/doc/luajit.html
index 721f636b522d600203eeda6897c19b40dbd84f46..8a653e2d1a147d707c5ab1e7e6931410470936fa 100644 (file)
--- a/doc/luajit.html
+++ b/doc/luajit.html
@@ -166,7 +166,7 @@ LuaJIT is Copyright © 2005-2015 Mike Pall, released under the
 <tr><td><span style="font-size:90%;">Embedded</span></td><td>Android</td><td>iOS</td></tr>
 </table>
 <table class="feature os os3">
-<tr><td>PS3</td><td>PS4</td><td>PS Vita</td><td>Xbox 360</td></tr>
+<tr><td>PS3</td><td>PS4</td><td>PS Vita</td><td>Xbox 360</td><td>Xbox One</td></tr>
 </table>
 <table class="feature compiler">
 <tr><td>GCC</td><td>CLANG<br>LLVM</td><td>MSVC</td></tr>

diff --git a/src/lib_io.c b/src/lib_io.c
index 468d327539a00dedd52a52bd0c2c5b79e768edb3..8836d052df9a160e21350aeec54abb12645cb76d 100644 (file)
--- a/src/lib_io.c
+++ b/src/lib_io.c
@@ -99,7 +99,7 @@ static int io_file_close(lua_State *L, IOFileUD *iof)
     int stat = -1;
 #if LJ_TARGET_POSIX
     stat = pclose(iof->fp);
-#elif LJ_TARGET_WINDOWS
+#elif LJ_TARGET_WINDOWS && !LJ_TARGET_XBOXONE
     stat = _pclose(iof->fp);
 #else
     lua_assert(0);
@@ -400,7 +400,7 @@ LJLIB_CF(io_open)
 
 LJLIB_CF(io_popen)
 {
-#if LJ_TARGET_POSIX || LJ_TARGET_WINDOWS
+#if LJ_TARGET_POSIX || (LJ_TARGET_WINDOWS && !LJ_TARGET_XBOXONE)
   const char *fname = strdata(lj_lib_checkstr(L, 1));
   GCstr *s = lj_lib_optstr(L, 2);
   const char *mode = s ? strdata(s) : "r";

diff --git a/src/lib_package.c b/src/lib_package.c
index 6b6eb8f6f88ea3d46c7e2d438632d223c4c0b573..014cfd9efec8f7e47f570ad56c3201fa7bc18b4f 100644 (file)
--- a/src/lib_package.c
+++ b/src/lib_package.c
@@ -96,9 +96,17 @@ static void setprogdir(lua_State *L)
 static void pusherror(lua_State *L)
 {
   DWORD error = GetLastError();
+#if LJ_TARGET_XBOXONE
+  wchar_t wbuffer[128];
+  char buffer[128*2];
+  if (FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
+      NULL, error, 0, buffer, sizeof(wbuffer)/sizeof(wchar_t), NULL) &&
+      WideCharToMultiByte(CP_ACP, 0, wbuffer, 128, buffer, 128*2, NULL, NULL))
+#else
   char buffer[128];
   if (FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
       NULL, error, 0, buffer, sizeof(buffer), NULL))
+#endif
     lua_pushstring(L, buffer);
   else
     lua_pushfstring(L, "system error %d\n", error);

diff --git a/src/lj_arch.h b/src/lj_arch.h
index 96e9a99e221dec21e11e80e023dc80044703ba65..e705a3b2e6d349698902f7df49b19d7af7b75eda 100644 (file)
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -120,6 +120,13 @@
 #define LJ_TARGET_CONSOLE      1
 #endif
 
+#ifdef _DURANGO
+#define LJ_TARGET_XBOXONE      1
+#define LJ_TARGET_CONSOLE      1
+#define LJ_TARGET_GC64         1
+#define LoadLibraryA(name)      LoadLibraryExA((name), NULL, 0)
+#endif
+
 #define LJ_NUMMODE_SINGLE      0       /* Single-number mode only. */
 #define LJ_NUMMODE_SINGLE_DUAL 1       /* Default to single-number mode. */
 #define LJ_NUMMODE_DUAL                2       /* Dual-number mode only. */

diff --git a/src/lj_clib.c b/src/lj_clib.c
index 6bdad67fef096c58e547cb6ec580c2f8328c7d6d..74b4b0018a6e6f9cd3262c34a27e55d3f65e1419 100644 (file)
--- a/src/lj_clib.c
+++ b/src/lj_clib.c
@@ -172,9 +172,17 @@ LJ_NORET LJ_NOINLINE static void clib_error(lua_State *L, const char *fmt,
                                            const char *name)
 {
   DWORD err = GetLastError();
+#if LJ_TARGET_XBOXONE
+  wchar_t wbuf[128];
+  char buf[128*2];
+  if (!FormatMessageW(FORMAT_MESSAGE_IGNORE_INSERTS|FORMAT_MESSAGE_FROM_SYSTEM,
+                     NULL, err, 0, buf, sizeof(wbuf)/sizeof(wchar_t), NULL) ||
+      !WideCharToMultiByte(CP_ACP, 0, wbuf, 128, buf, 128*2, NULL, NULL))
+#else
   char buf[128];
   if (!FormatMessageA(FORMAT_MESSAGE_IGNORE_INSERTS|FORMAT_MESSAGE_FROM_SYSTEM,
                      NULL, err, 0, buf, sizeof(buf), NULL))
+#endif
     buf[0] = '\0';
   lj_err_callermsg(L, lj_strfmt_pushf(L, fmt, name, buf));
 }

diff --git a/src/xb1build.bat b/src/xb1build.bat
new file mode 100644 (file)
index 0000000..847e84a
--- /dev/null
+++ b/src/xb1build.bat
@@ -0,0 +1,101 @@
+@rem Script to build LuaJIT with the Xbox One SDK.\r
+@rem Donated to the public domain.\r
+@rem\r
+@rem Open a "Visual Studio .NET Command Prompt" (64 bit host compiler)\r
+@rem Then cd to this directory and run this script.\r
+\r
+@if not defined INCLUDE goto :FAIL\r
+@if not defined DurangoXDK goto :FAIL\r
+\r
+@setlocal\r
+@echo ---- Host compiler ----\r
+@set LJCOMPILE=cl /nologo /c /MD /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /DLUAJIT_ENABLE_GC64\r
+@set LJLINK=link /nologo\r
+@set LJMT=mt /nologo\r
+@set DASMDIR=..\dynasm\r
+@set DASM=%DASMDIR%\dynasm.lua\r
+@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c\r
+\r
+%LJCOMPILE% host\minilua.c\r
+@if errorlevel 1 goto :BAD\r
+%LJLINK% /out:minilua.exe minilua.obj\r
+@if errorlevel 1 goto :BAD\r
+if exist minilua.exe.manifest^\r
+  %LJMT% -manifest minilua.exe.manifest -outputresource:minilua.exe\r
+\r
+@rem Error out for 64 bit host compiler\r
+@minilua\r
+@if not errorlevel 8 goto :FAIL\r
+\r
+@set DASMFLAGS=-D WIN -D FFI -D P64\r
+minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x64.dasc\r
+@if errorlevel 1 goto :BAD\r
+\r
+%LJCOMPILE% /I "." /I %DASMDIR% /D_DURANGO host\buildvm*.c\r
+@if errorlevel 1 goto :BAD\r
+%LJLINK% /out:buildvm.exe buildvm*.obj\r
+@if errorlevel 1 goto :BAD\r
+if exist buildvm.exe.manifest^\r
+  %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe\r
+\r
+buildvm -m peobj -o lj_vm.obj\r
+@if errorlevel 1 goto :BAD\r
+buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%\r
+@if errorlevel 1 goto :BAD\r
+buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%\r
+@if errorlevel 1 goto :BAD\r
+buildvm -m libdef -o lj_libdef.h %ALL_LIB%\r
+@if errorlevel 1 goto :BAD\r
+buildvm -m recdef -o lj_recdef.h %ALL_LIB%\r
+@if errorlevel 1 goto :BAD\r
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%\r
+@if errorlevel 1 goto :BAD\r
+buildvm -m folddef -o lj_folddef.h lj_opt_fold.c\r
+@if errorlevel 1 goto :BAD\r
+\r
+@echo ---- Cross compiler ----\r
+\r
+@set CWD=%cd%\r
+@call "%DurangoXDK%\xdk\DurangoVars.cmd" XDK\r
+@cd /D "%CWD%"\r
+@shift\r
+\r
+@set LJCOMPILE="cl" /nologo /c /W3 /GF /Gm- /GR- /GS- /Gy /openmp- /D_CRT_SECURE_NO_DEPRECATE /D_LIB /D_UNICODE /D_DURANGO\r
+@set LJLIB="lib" /nologo\r
+\r
+@if "%1"=="debug" (\r
+  @shift\r
+  @set LJCOMPILE=%LJCOMPILE% /Zi /MDd /Od\r
+  @set LJLINK=%LJLINK% /debug \r
+) else (\r
+  @set LJCOMPILE=%LJCOMPILE% /MD /O2 /DNDEBUG\r
+)\r
+\r
+@if "%1"=="amalg" goto :AMALG\r
+%LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c\r
+@if errorlevel 1 goto :BAD\r
+%LJLIB% /OUT:luajit.lib lj_*.obj lib_*.obj\r
+@if errorlevel 1 goto :BAD\r
+@goto :NOAMALG\r
+:AMALG\r
+%LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c\r
+@if errorlevel 1 goto :BAD\r
+%LJLIB% /OUT:luajit.lib ljamalg.obj lj_vm.obj\r
+@if errorlevel 1 goto :BAD\r
+:NOAMALG\r
+\r
+@del *.obj *.manifest minilua.exe buildvm.exe\r
+@echo.\r
+@echo === Successfully built LuaJIT for Xbox One ===\r
+\r
+@goto :END\r
+:BAD\r
+@echo.\r
+@echo *******************************************************\r
+@echo *** Build FAILED -- Please check the error messages ***\r
+@echo *******************************************************\r
+@goto :END\r
+:FAIL\r
+@echo To run this script you must open a "Visual Studio .NET Command Prompt"\r
+@echo (64 bit host compiler). The Xbox One SDK must be installed, too.\r
+:END\r