Previous 199869 Revisions Next

r36663 Thursday 26th March, 2015 at 10:13:37 UTC by Vasantha Crabb
Decorate 64-bit constants, fixes some 32-bit builds
[/trunk].gitignore makefile
[scripts]genie.lua
[src/emu/cpu/i386]pentops.inc

trunk/.gitignore
r245174r245175
1717src/regtests/jedutil/output
1818/sta
1919*.pyc
20/build
No newline at end of file
20/.build
No newline at end of file
trunk/makefile
r245174r245175
158158  COPY  = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))"
159159endif
160160
161GENDIR = build/generated
161GENDIR = .build/generated
162162
163163PYTHON = @python
164164CC = @gcc
r245174r245175
201201ifndef COMPILE
202202   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw64-gcc --targetos=windows --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
203203endif
204   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(WINDRES)
204   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(WINDRES)
205205
206206windows_x86: generate
207207ifndef MINGW32
r245174r245175
210210ifndef COMPILE
211211   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw32-gcc --targetos=windows --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
212212endif
213   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(WINDRES)
213   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(WINDRES)
214214
215215windows_x64_clang: generate
216216ifndef CLANG
r245174r245175
219219ifndef COMPILE
220220   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw-clang --targetos=windows --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
221221endif
222   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(WINDRES)
222   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(WINDRES)
223223   
224224windows_x86_clang: generate
225225ifndef CLANG
r245174r245175
228228ifndef COMPILE
229229   $(SILENT) $(GENIE) $(PARAMS) --gcc=mingw-clang --targetos=windows --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
230230endif
231   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES)
231   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES)
232232
233233vs2010: generate
234234   $(SILENT) $(GENIE) $(PARAMS) --targetos=$(TARGETOS) --osd=windows --target=$(TARGET) --subtarget=$(SUBTARGET) vs2010
r245174r245175
264264ifndef COMPILE
265265   $(SILENT) $(GENIE) --gcc=android-arm --osd=osdmini --target=$(TARGET) --gcc_version=4.8 --subtarget=$(SUBTARGET) gmake
266266endif
267   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-android-arm config=$(CONFIG)
267   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-android-arm config=$(CONFIG)
268268
269269android-mips: generate
270270ifndef ANDROID_NDK_MIPS
r245174r245175
276276ifndef COMPILE
277277   $(SILENT) $(GENIE) --gcc=android-mips --osd=osdmini --target=$(TARGET) --gcc_version=4.8 --subtarget=$(SUBTARGET) gmake
278278endif
279   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-android-mips config=$(CONFIG)
279   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-android-mips config=$(CONFIG)
280280
281281android-x86: generate
282282ifndef ANDROID_NDK_X86
r245174r245175
288288ifndef COMPILE
289289   $(SILENT) $(GENIE) --gcc=android-x86 --osd=osdmini --target=$(TARGET) --gcc_version=4.8 --subtarget=$(SUBTARGET) gmake
290290endif
291   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-android-x86 config=$(CONFIG)
291   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-android-x86 config=$(CONFIG)
292292
293293asmjs: generate
294294ifndef EMSCRIPTEN
r245174r245175
297297ifndef COMPILE
298298   $(SILENT) $(GENIE) --gcc=asmjs --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
299299endif
300   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-asmjs config=$(CONFIG)
300   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-asmjs config=$(CONFIG)
301301
302302nacl_x64: generate
303303ifndef NACL_SDK_ROOT
r245174r245175
306306ifndef COMPILE
307307   $(SILENT) $(GENIE) --gcc=nacl --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
308308endif
309   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-nacl config=$(CONFIG)64
309   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-nacl config=$(CONFIG)64
310310
311311nacl_x86: generate
312312ifndef NACL_SDK_ROOT
r245174r245175
315315ifndef COMPILE
316316   $(SILENT) $(GENIE) --gcc=nacl --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
317317endif
318   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-nacl config=$(CONFIG)32
318   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-nacl config=$(CONFIG)32
319319
320320nacl-arm: generate
321321ifndef NACL_SDK_ROOT
r245174r245175
324324ifndef COMPILE
325325   $(SILENT) $(GENIE) --gcc=nacl-arm --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
326326endif
327   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-nacl-arm config=$(CONFIG)
327   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-nacl-arm config=$(CONFIG)
328328
329329pnacl: generate
330330ifndef NACL_SDK_ROOT
r245174r245175
333333ifndef COMPILE
334334   $(SILENT) $(GENIE) --gcc=pnacl --gcc_version=4.8 --osd=osdmini --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
335335endif
336   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-pnacl config=$(CONFIG)
336   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-pnacl config=$(CONFIG)
337337
338338linux_x64: generate
339339ifndef COMPILE
340340   $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-gcc --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
341341endif
342   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux config=$(CONFIG)64
342   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-linux config=$(CONFIG)64
343343
344344linux_x86: generate
345345ifndef COMPILE
346346   $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-gcc --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
347347endif
348   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux config=$(CONFIG)32
348   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-linux config=$(CONFIG)32
349349
350350linux_x64_clang: generate
351351ifndef COMPILE
352352   $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-clang --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
353353endif
354   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux-clang config=$(CONFIG)64
354   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-linux-clang config=$(CONFIG)64
355355
356356linux_x86_clang: generate
357357ifndef COMPILE
358358   $(SILENT) $(GENIE) $(PARAMS) --gcc=linux-clang --targetos=$(TARGETOS) --osd=$(OSD) --gcc_version=$(CLANG_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
359359endif
360   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-linux-clang config=$(CONFIG)32
360   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-linux-clang config=$(CONFIG)32
361361
362362macosx_x64: generate
363363ifndef COMPILE
364364   $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --targetos=macosx --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
365365endif
366   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx config=$(CONFIG)64
366   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-osx config=$(CONFIG)64
367367
368368macosx_x86: generate
369369ifndef COMPILE
370370   $(SILENT) $(GENIE) $(PARAMS) --gcc=osx --targetos=macosx --os_version=$(DARWIN_VERSION) --osd=$(OSD) --gcc_version=$(GCC_VERSION) --target=$(TARGET) --subtarget=$(SUBTARGET) gmake
371371endif
372   $(SILENT) $(MAKE) --no-print-directory -R -C build/projects/gmake-osx config=$(CONFIG)32
372   $(SILENT) $(MAKE) --no-print-directory -R -C .build/projects/gmake-osx config=$(CONFIG)32
373373
374374$(GENIE):
375375   $(SILENT) $(MAKE) --no-print-directory -R -C 3rdparty/genie/build/gmake.$(OS) -f genie.make
376376
377377clean:
378378   @echo Cleaning...
379   -@rm -rf build
379   -@rm -rf .build
380380   $(SILENT) $(MAKE) --no-print-directory -R -C 3rdparty/genie/build/gmake.$(OS) -f genie.make clean
381381
382382GEN_FOLDERS :=  \
trunk/scripts/genie.lua
r245174r245175
11premake.check_paths = true
22premake.make.override = { "TARGET" }
33MAME_DIR = (path.getabsolute("..") .. "/")
4local MAME_BUILD_DIR = (MAME_DIR .. "build/")
4local MAME_BUILD_DIR = (MAME_DIR .. ".build/")
55local naclToolchain = ""
66
77
trunk/src/emu/cpu/i386/pentops.inc
r245174r245175
44174417   switch (imm8 & 7)
44184418   {
44194419   case 0:
4420      d.q[0]=d.f64[0] == s.f64[0] ? 0xffffffffffffffff : 0;
4421      d.q[1]=d.f64[1] == s.f64[1] ? 0xffffffffffffffff : 0;
4420      d.q[0]=d.f64[0] == s.f64[0] ? U64(0xffffffffffffffff) : 0;
4421      d.q[1]=d.f64[1] == s.f64[1] ? U64(0xffffffffffffffff) : 0;
44224422      break;
44234423   case 1:
4424      d.q[0]=d.f64[0] < s.f64[0] ? 0xffffffffffffffff : 0;
4425      d.q[1]=d.f64[1] < s.f64[1] ? 0xffffffffffffffff : 0;
4424      d.q[0]=d.f64[0] < s.f64[0] ? U64(0xffffffffffffffff) : 0;
4425      d.q[1]=d.f64[1] < s.f64[1] ? U64(0xffffffffffffffff) : 0;
44264426      break;
44274427   case 2:
4428      d.q[0]=d.f64[0] <= s.f64[0] ? 0xffffffffffffffff : 0;
4429      d.q[1]=d.f64[1] <= s.f64[1] ? 0xffffffffffffffff : 0;
4428      d.q[0]=d.f64[0] <= s.f64[0] ? U64(0xffffffffffffffff) : 0;
4429      d.q[1]=d.f64[1] <= s.f64[1] ? U64(0xffffffffffffffff) : 0;
44304430      break;
44314431   case 3:
4432      d.q[0]=sse_isdoubleunordered(d.f64[0], s.f64[0]) ? 0xffffffffffffffff : 0;
4433      d.q[1]=sse_isdoubleunordered(d.f64[1], s.f64[1]) ? 0xffffffffffffffff : 0;
4432      d.q[0]=sse_isdoubleunordered(d.f64[0], s.f64[0]) ? U64(0xffffffffffffffff) : 0;
4433      d.q[1]=sse_isdoubleunordered(d.f64[1], s.f64[1]) ? U64(0xffffffffffffffff) : 0;
44344434      break;
44354435   case 4:
4436      d.q[0]=d.f64[0] != s.f64[0] ? 0xffffffffffffffff : 0;
4437      d.q[1]=d.f64[1] != s.f64[1] ? 0xffffffffffffffff : 0;
4436      d.q[0]=d.f64[0] != s.f64[0] ? U64(0xffffffffffffffff) : 0;
4437      d.q[1]=d.f64[1] != s.f64[1] ? U64(0xffffffffffffffff) : 0;
44384438      break;
44394439   case 5:
4440      d.q[0]=d.f64[0] < s.f64[0] ? 0 : 0xffffffffffffffff;
4441      d.q[1]=d.f64[1] < s.f64[1] ? 0 : 0xffffffffffffffff;
4440      d.q[0]=d.f64[0] < s.f64[0] ? 0 : U64(0xffffffffffffffff);
4441      d.q[1]=d.f64[1] < s.f64[1] ? 0 : U64(0xffffffffffffffff);
44424442      break;
44434443   case 6:
4444      d.q[0]=d.f64[0] <= s.f64[0] ? 0 : 0xffffffffffffffff;
4445      d.q[1]=d.f64[1] <= s.f64[1] ? 0 : 0xffffffffffffffff;
4444      d.q[0]=d.f64[0] <= s.f64[0] ? 0 : U64(0xffffffffffffffff);
4445      d.q[1]=d.f64[1] <= s.f64[1] ? 0 : U64(0xffffffffffffffff);
44464446      break;
44474447   case 7:
4448      d.q[0]=sse_isdoubleordered(d.f64[0], s.f64[0]) ? 0xffffffffffffffff : 0;
4449      d.q[1]=sse_isdoubleordered(d.f64[1], s.f64[1]) ? 0xffffffffffffffff : 0;
4448      d.q[0]=sse_isdoubleordered(d.f64[0], s.f64[0]) ? U64(0xffffffffffffffff) : 0;
4449      d.q[1]=sse_isdoubleordered(d.f64[1], s.f64[1]) ? U64(0xffffffffffffffff) : 0;
44504450      break;
44514451   }
44524452}
r245174r245175
44874487   switch (imm8 & 7)
44884488   {
44894489   case 0:
4490      d.q[0]=d.f64[0] == s.f64[0] ? 0xffffffffffffffff : 0;
4490      d.q[0]=d.f64[0] == s.f64[0] ? U64(0xffffffffffffffff) : 0;
44914491      break;
44924492   case 1:
4493      d.q[0]=d.f64[0] < s.f64[0] ? 0xffffffffffffffff : 0;
4493      d.q[0]=d.f64[0] < s.f64[0] ? U64(0xffffffffffffffff) : 0;
44944494      break;
44954495   case 2:
4496      d.q[0]=d.f64[0] <= s.f64[0] ? 0xffffffffffffffff : 0;
4496      d.q[0]=d.f64[0] <= s.f64[0] ? U64(0xffffffffffffffff) : 0;
44974497      break;
44984498   case 3:
4499      d.q[0]=sse_isdoubleunordered(d.f64[0], s.f64[0]) ? 0xffffffffffffffff : 0;
4499      d.q[0]=sse_isdoubleunordered(d.f64[0], s.f64[0]) ? U64(0xffffffffffffffff) : 0;
45004500      break;
45014501   case 4:
4502      d.q[0]=d.f64[0] != s.f64[0] ? 0xffffffffffffffff : 0;
4502      d.q[0]=d.f64[0] != s.f64[0] ? U64(0xffffffffffffffff) : 0;
45034503      break;
45044504   case 5:
4505      d.q[0]=d.f64[0] < s.f64[0] ? 0 : 0xffffffffffffffff;
4505      d.q[0]=d.f64[0] < s.f64[0] ? 0 : U64(0xffffffffffffffff);
45064506      break;
45074507   case 6:
4508      d.q[0]=d.f64[0] <= s.f64[0] ? 0 : 0xffffffffffffffff;
4508      d.q[0]=d.f64[0] <= s.f64[0] ? 0 : U64(0xffffffffffffffff);
45094509      break;
45104510   case 7:
4511      d.q[0]=sse_isdoubleordered(d.f64[0], s.f64[0]) ? 0xffffffffffffffff : 0;
4511      d.q[0]=sse_isdoubleordered(d.f64[0], s.f64[0]) ? U64(0xffffffffffffffff) : 0;
45124512      break;
45134513   }
45144514}

https://github.com/mamedev/mame/commit/991b1364e33093ec443dc389973dbcc6a22246fa

Previous 199869 Revisions Next

© 1997-2024 The MAME Team