From 100fa28671af455853a6de1b2d7a3499fa6e185c Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 18 Mar 2016 19:22:43 +1100 Subject: * Remove confusing method from vectorstreams that hide base_ios method (fixes disassembly view) * Allow std::string to pass through core_file unmolested (reduces temporary allocations) * Make zip/7z instances of same class with uniform interface * zippath browsing is broken at the moment This is another step towards transparent archive support. It's now possible to access zip and 7z archives with the same code. Nothing is taking advantage of it yet. There's now some very similar code in fileio.cpp and clifront.cpp that could be folded at some point. --- scripts/src/tools.lua | 119 +++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 59 deletions(-) (limited to 'scripts/src') diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index af134d0e77a..0339e9920b2 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -15,19 +15,20 @@ project("romcmp") uuid ("1b40275b-194c-497b-8abd-9338775a21b8") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", "expat", + "7z", "ocore_" .. _OPTIONS["osd"], } @@ -64,13 +65,13 @@ strip() project("chdman") uuid ("7d948868-42db-432a-9bb5-70ce5c5f4620") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -126,13 +127,13 @@ strip() project("jedutil") uuid ("bda60edb-f7f5-489f-b232-23d33c43dda1") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -175,13 +176,13 @@ strip() project("unidasm") uuid ("65f81d3b-299a-4b08-a3fa-d5241afa9fd1") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -189,7 +190,7 @@ links { "dasm", "utils", "expat", - "7z", + "7z", "ocore_" .. _OPTIONS["osd"], } @@ -238,20 +239,20 @@ strip() project("ldresample") uuid ("3401561a-4407-4e13-9c6d-c0801330f7cc") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", "expat", - "7z", + "7z", "ocore_" .. _OPTIONS["osd"], } @@ -299,20 +300,20 @@ strip() project("ldverify") uuid ("3e66560d-b928-4227-928b-eadd0a10f00a") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", "expat", - "7z", + "7z", "ocore_" .. _OPTIONS["osd"], } @@ -360,13 +361,13 @@ strip() project("regrep") uuid ("7f6de580-d800-4e8d-bed6-9fc86829584d") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -409,13 +410,13 @@ strip() project("srcclean") uuid ("4dd58139-313a-42c5-965d-f378bdeed220") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -458,13 +459,13 @@ strip() project("src2html") uuid ("b31e963a-09ef-4696-acbd-e663e35ce6f7") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -507,13 +508,13 @@ strip() project("split") uuid ("8ef6ff18-3199-4cc2-afd0-d64033070faa") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -567,13 +568,13 @@ strip() project("pngcmp") uuid ("61f647d9-b129-409b-9c62-8acf98ed39be") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -616,13 +617,13 @@ strip() project("nltool") uuid ("853a03b7-fa37-41a8-8250-0dc23dd935d6") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -678,13 +679,13 @@ strip() project("nlwav") uuid ("7c5396d1-2a1a-4c93-bed6-6b8fa182054a") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -718,13 +719,13 @@ strip() project("castool") uuid ("7d9ed428-e2ba-4448-832d-d882a64d5c22") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -758,7 +759,7 @@ end includedirs { MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } @@ -780,13 +781,13 @@ strip() project("floptool") uuid ("85d8e3a6-1661-4ac9-8c21-281d20cbaf5b") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -821,7 +822,7 @@ end includedirs { MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } @@ -843,13 +844,13 @@ strip() project("imgtool") uuid ("f3707807-e587-4297-a5d8-bc98f3d0b1ca") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -884,10 +885,10 @@ end includedirs { MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty/zlib", - MAME_DIR .. "src/tools/imgtool", + MAME_DIR .. "src/tools/imgtool", } files { @@ -908,21 +909,21 @@ files { MAME_DIR .. "src/tools/imgtool/imgtool.cpp", MAME_DIR .. "src/tools/imgtool/imgtool.h", MAME_DIR .. "src/tools/imgtool/imgterrs.cpp", - MAME_DIR .. "src/tools/imgtool/imgterrs.h", - MAME_DIR .. "src/tools/imgtool/imghd.cpp", + MAME_DIR .. "src/tools/imgtool/imgterrs.h", + MAME_DIR .. "src/tools/imgtool/imghd.cpp", MAME_DIR .. "src/tools/imgtool/imghd.h", MAME_DIR .. "src/tools/imgtool/charconv.cpp", MAME_DIR .. "src/tools/imgtool/charconv.h", MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp", MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp", - MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", + MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", MAME_DIR .. "src/tools/imgtool/modules/amiga.cpp", MAME_DIR .. "src/tools/imgtool/modules/macbin.cpp", MAME_DIR .. "src/tools/imgtool/modules/rsdos.cpp", MAME_DIR .. "src/tools/imgtool/modules/os9.cpp", MAME_DIR .. "src/tools/imgtool/modules/mac.cpp", - MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp", + MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp", MAME_DIR .. "src/tools/imgtool/modules/ti990hd.cpp", MAME_DIR .. "src/tools/imgtool/modules/concept.cpp", MAME_DIR .. "src/tools/imgtool/modules/fat.cpp", -- cgit v1.2.3 From 45f20a43c76dd2b8a1379a8586e73ed61c70146f Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 18 Mar 2016 14:00:16 +0100 Subject: added attotime test for balrog (nw) --- scripts/src/tests.lua | 2 ++ tests/emu/attotime.cpp | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 tests/emu/attotime.cpp (limited to 'scripts/src') diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index baba88df28c..813f32c31ac 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -70,11 +70,13 @@ project("tests") includedirs { MAME_DIR .. "3rdparty/googletest/googletest/include", MAME_DIR .. "src/osd", + MAME_DIR .. "src/emu", MAME_DIR .. "src/lib/util", } files { MAME_DIR .. "tests/main.cpp", MAME_DIR .. "tests/lib/util/corestr.cpp", + MAME_DIR .. "tests/emu/attotime.cpp", } diff --git a/tests/emu/attotime.cpp b/tests/emu/attotime.cpp new file mode 100644 index 00000000000..7d170c32abe --- /dev/null +++ b/tests/emu/attotime.cpp @@ -0,0 +1,10 @@ +#include "gtest/gtest.h" +#include "emucore.h" +#include "eminline.h" +#include "attotime.h" + +TEST(attotime,as_attoseconds) +{ + attotime value = attotime::from_seconds(1); + EXPECT_EQ(1000000000000000000, value.as_attoseconds()); +} -- cgit v1.2.3 From 0e76e679c77b63c24e2a226be2feb1461ac3ab90 Mon Sep 17 00:00:00 2001 From: balr0g Date: Fri, 18 Mar 2016 09:21:34 -0400 Subject: Rename 'tests' to 'mametests' to avoid name clash (nw) --- scripts/src/tests.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/src') diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua index 813f32c31ac..e69888d53a4 100644 --- a/scripts/src/tests.lua +++ b/scripts/src/tests.lua @@ -40,7 +40,7 @@ end } -project("tests") +project("mametests") uuid ("66d4c639-196b-4065-a411-7ee9266564f5") kind "ConsoleApp" -- cgit v1.2.3