diff options
-rw-r--r-- | doc/install.html | 6 | ||||
-rw-r--r-- | doc/luajit.html | 2 | ||||
-rw-r--r-- | src/lj_def.h | 2 | ||||
-rw-r--r-- | src/vm_ppc.dasc | 4 | ||||
-rw-r--r-- | src/xedkbuild.bat | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/doc/install.html b/doc/install.html index 5a1ea525..07680107 100644 --- a/doc/install.html +++ b/doc/install.html | |||
@@ -136,7 +136,7 @@ operating systems, CPUs and compilers: | |||
136 | <td class="compatos">GCC 4.3+</td> | 136 | <td class="compatos">GCC 4.3+</td> |
137 | <td class="compatos">GCC 4.3+<br>GCC 4.1 (<a href="#ps3">PS3</a>)</td> | 137 | <td class="compatos">GCC 4.3+<br>GCC 4.1 (<a href="#ps3">PS3</a>)</td> |
138 | <td class="compatos compatno"> </td> | 138 | <td class="compatos compatno"> </td> |
139 | <td class="compatos">XEDK (<a href="#xbox360">XBox 360</a>)</td> | 139 | <td class="compatos">XEDK (<a href="#xbox360">Xbox 360</a>)</td> |
140 | </tr> | 140 | </tr> |
141 | <tr class="odd"> | 141 | <tr class="odd"> |
142 | <td class="compatcpu"><a href="#cross2">PPC/e500v2</a></td> | 142 | <td class="compatcpu"><a href="#cross2">PPC/e500v2</a></td> |
@@ -468,8 +468,8 @@ only the fast interpreter is built: | |||
468 | make HOST_CC="gcc -m32" CROSS=ppu-lv2- | 468 | make HOST_CC="gcc -m32" CROSS=ppu-lv2- |
469 | </pre> | 469 | </pre> |
470 | <p> | 470 | <p> |
471 | You can cross-compile for <b id="xbox360">XBox 360</b> using the | 471 | You can cross-compile for <b id="xbox360">Xbox 360</b> using the |
472 | XBox 360 SDK (MSVC + XEDK). Due to restrictions on consoles, the | 472 | Xbox 360 SDK (MSVC + XEDK). Due to restrictions on consoles, the |
473 | JIT compiler is disabled and only the fast interpreter is built. | 473 | JIT compiler is disabled and only the fast interpreter is built. |
474 | </p> | 474 | </p> |
475 | <p> | 475 | <p> |
diff --git a/doc/luajit.html b/doc/luajit.html index f02c668c..e8581d3a 100644 --- a/doc/luajit.html +++ b/doc/luajit.html | |||
@@ -158,7 +158,7 @@ LuaJIT is Copyright © 2005-2013 Mike Pall, released under the | |||
158 | <tr><td>Windows</td><td>Linux</td><td>BSD</td><td>OSX</td><td>POSIX</td></tr> | 158 | <tr><td>Windows</td><td>Linux</td><td>BSD</td><td>OSX</td><td>POSIX</td></tr> |
159 | </table> | 159 | </table> |
160 | <table class="feature os os2"> | 160 | <table class="feature os os2"> |
161 | <tr><td><span style="font-size:90%;">Embedded</span></td><td>Android</td><td>iOS</td><td>PS3</td><td>XBox 360</td></tr> | 161 | <tr><td><span style="font-size:90%;">Embedded</span></td><td>Android</td><td>iOS</td><td>PS3</td><td>Xbox 360</td></tr> |
162 | </table> | 162 | </table> |
163 | <table class="feature compiler"> | 163 | <table class="feature compiler"> |
164 | <tr><td>GCC</td><td>CLANG<br>LLVM</td><td>MSVC</td></tr> | 164 | <tr><td>GCC</td><td>CLANG<br>LLVM</td><td>MSVC</td></tr> |
diff --git a/src/lj_def.h b/src/lj_def.h index 5c427b14..9a22e3bd 100644 --- a/src/lj_def.h +++ b/src/lj_def.h | |||
@@ -273,7 +273,7 @@ uint64_t _byteswap_uint64(uint64_t); | |||
273 | 273 | ||
274 | #if defined(_M_PPC) && defined(LUAJIT_NO_UNALIGNED) | 274 | #if defined(_M_PPC) && defined(LUAJIT_NO_UNALIGNED) |
275 | /* | 275 | /* |
276 | ** Replacement for unaligned loads on XBox 360. Disabled by default since it's | 276 | ** Replacement for unaligned loads on Xbox 360. Disabled by default since it's |
277 | ** usually more costly than the occasional stall when crossing a cache-line. | 277 | ** usually more costly than the occasional stall when crossing a cache-line. |
278 | */ | 278 | */ |
279 | static LJ_AINLINE uint16_t lj_getu16(const void *v) | 279 | static LJ_AINLINE uint16_t lj_getu16(const void *v) |
diff --git a/src/vm_ppc.dasc b/src/vm_ppc.dasc index 6778dee5..685ea518 100644 --- a/src/vm_ppc.dasc +++ b/src/vm_ppc.dasc | |||
@@ -21,11 +21,11 @@ | |||
21 | |// Note: a full PPC64 _LP64 port is not planned. | 21 | |// Note: a full PPC64 _LP64 port is not planned. |
22 | |// GPR64 64 bit registers (but possibly 32 bit pointers, e.g. PS3). | 22 | |// GPR64 64 bit registers (but possibly 32 bit pointers, e.g. PS3). |
23 | |// Affects reg saves, stack layout, carry/overflow/dot flags etc. | 23 | |// Affects reg saves, stack layout, carry/overflow/dot flags etc. |
24 | |// FRAME32 Use 32 bit frame layout, even with GPR64 (XBox 360). | 24 | |// FRAME32 Use 32 bit frame layout, even with GPR64 (Xbox 360). |
25 | |// TOC Need table of contents (64 bit or 32 bit variant, e.g. PS3). | 25 | |// TOC Need table of contents (64 bit or 32 bit variant, e.g. PS3). |
26 | |// Function pointers are really a struct: code, TOC, env (optional). | 26 | |// Function pointers are really a struct: code, TOC, env (optional). |
27 | |// TOCENV Function pointers have an environment pointer, too (not on PS3). | 27 | |// TOCENV Function pointers have an environment pointer, too (not on PS3). |
28 | |// PPE Power Processor Element of Cell (PS3) or Xenon (XBox 360). | 28 | |// PPE Power Processor Element of Cell (PS3) or Xenon (Xbox 360). |
29 | |// Must avoid (slow) micro-coded instructions. | 29 | |// Must avoid (slow) micro-coded instructions. |
30 | | | 30 | | |
31 | |.if P64 | 31 | |.if P64 |
diff --git a/src/xedkbuild.bat b/src/xedkbuild.bat index 451b2f82..375f1955 100644 --- a/src/xedkbuild.bat +++ b/src/xedkbuild.bat | |||
@@ -1,4 +1,4 @@ | |||
1 | @rem Script to build LuaJIT with the XBox 360 SDK. | 1 | @rem Script to build LuaJIT with the Xbox 360 SDK. |
2 | @rem Donated to the public domain. | 2 | @rem Donated to the public domain. |
3 | @rem | 3 | @rem |
4 | @rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler) | 4 | @rem Open a "Visual Studio .NET Command Prompt" (32 bit host compiler) |
@@ -77,7 +77,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c | |||
77 | 77 | ||
78 | @del *.obj *.manifest minilua.exe buildvm.exe | 78 | @del *.obj *.manifest minilua.exe buildvm.exe |
79 | @echo. | 79 | @echo. |
80 | @echo === Successfully built LuaJIT for XBox 360 === | 80 | @echo === Successfully built LuaJIT for Xbox 360 === |
81 | 81 | ||
82 | @goto :END | 82 | @goto :END |
83 | :BAD | 83 | :BAD |
@@ -88,5 +88,5 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c | |||
88 | @goto :END | 88 | @goto :END |
89 | :FAIL | 89 | :FAIL |
90 | @echo To run this script you must open a "Visual Studio .NET Command Prompt" | 90 | @echo To run this script you must open a "Visual Studio .NET Command Prompt" |
91 | @echo (32 bit host compiler). The XBox 360 SDK must be installed, too. | 91 | @echo (32 bit host compiler). The Xbox 360 SDK must be installed, too. |
92 | :END | 92 | :END |