diff --git a/make.sh b/make.sh index 4640c824..fe766999 100755 --- a/make.sh +++ b/make.sh @@ -84,8 +84,8 @@ msvc_update_genfiles() { ${MAKE} cp qemu/qapi-types.h msvc/unicorn/qapi-types.h cp qemu/qapi-visit.h msvc/unicorn/qapi-visit.h - cp qemu/qapi-types.c msvc/unicorn/unicorn/qapi-types.c - cp qemu/qapi-visit.c msvc/unicorn/unicorn/qapi-visit.c + cp qemu/qapi-types.c msvc/unicorn/qapi-types.c + cp qemu/qapi-visit.c msvc/unicorn/qapi-visit.c cp qemu/config-host.h msvc/unicorn/config-host.h cp qemu/aarch64-softmmu/config-target.h msvc/unicorn/aarch64-softmmu/config-target.h cp qemu/arm-softmmu/config-target.h msvc/unicorn/arm-softmmu/config-target.h @@ -97,7 +97,6 @@ msvc_update_genfiles() { cp qemu/mips-softmmu/config-target.h msvc/unicorn/mips-softmmu/config-target.h cp qemu/sparc64-softmmu/config-target.h msvc/unicorn/sparc64-softmmu/config-target.h cp qemu/sparc-softmmu/config-target.h msvc/unicorn/sparc-softmmu/config-target.h - cp qemu/i386-softmmu/config-target.h msvc/unicorn/i386-softmmu/config-target.h cp qemu/x86_64-softmmu/config-target.h msvc/unicorn/x86_64-softmmu/config-target.h } diff --git a/msvc/samples/sample_armeb/sample_armeb.vcxproj b/msvc/samples/sample_armeb/sample_armeb.vcxproj new file mode 100644 index 00000000..1daf4e64 --- /dev/null +++ b/msvc/samples/sample_armeb/sample_armeb.vcxproj @@ -0,0 +1,173 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {1945F27B-ABB3-47F9-9268-A42F73C8B992} + Win32Proj + sample_armeb + + + + Application + true + v110_xp + MultiByte + + + Application + true + v110_xp + MultiByte + + + Application + false + v110_xp + true + MultiByte + + + Application + false + v110_xp + true + MultiByte + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + true + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(SolutionDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)$(Platform)\$(Configuration)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;__i386__ + MultiThreadedDebug + false + ../../../include + + + Console + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);unicorn_static.lib + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;__i386__ns) + MultiThreadedDebug + false + ../../../include + + + Console + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);unicorn_static.lib + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;__i386__ + MultiThreaded + false + ../../../include + + + Console + true + true + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);unicorn_static.lib + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;__i386__ + MultiThreaded + false + ../../../include + + + Console + true + true + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);unicorn_static.lib + $(SolutionDir)$(Platform)\$(Configuration)\ + + + + + + + + + \ No newline at end of file diff --git a/msvc/samples/sample_armeb/sample_armeb.vcxproj.filters b/msvc/samples/sample_armeb/sample_armeb.vcxproj.filters new file mode 100644 index 00000000..bdd745eb --- /dev/null +++ b/msvc/samples/sample_armeb/sample_armeb.vcxproj.filters @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/msvc/unicorn.sln b/msvc/unicorn.sln index a67744e2..0fcc4ed9 100644 --- a/msvc/unicorn.sln +++ b/msvc/unicorn.sln @@ -1,10 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86_64-softmmu", "unicorn\x86_64-softmmu\x86_64-softmmu.vcxproj", "{17077E86-AE7C-41AF-86ED-2BAC03B019BC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicorn_static", "unicorn\unicorn_static\unicorn_static.vcxproj", "{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicorn", "unicorn\unicorn\unicorn.vcxproj", "{ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}" ProjectSection(ProjectDependencies) = postProject + {740F3007-7BF0-4C0C-8FA5-2587C794EF31} = {740F3007-7BF0-4C0C-8FA5-2587C794EF31} {006A7908-ABF3-4D18-BC35-0A29E39B95F9} = {006A7908-ABF3-4D18-BC35-0A29E39B95F9} {63050112-E486-4396-B5E4-303C3BC12D39} = {63050112-E486-4396-B5E4-303C3BC12D39} {8804AD29-E398-480C-AC0F-98EC1B7A51CB} = {8804AD29-E398-480C-AC0F-98EC1B7A51CB} @@ -17,15 +16,29 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicorn_static", "unicorn\u {F67EB1EA-DCFA-4758-A2AA-4B570BA78036} = {F67EB1EA-DCFA-4758-A2AA-4B570BA78036} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_x86", "samples\sample_x86\sample_x86.vcxproj", "{F8053D66-8267-433A-BF2C-E07E2298C338}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicorn_static", "unicorn\unicorn_static\unicorn_static.vcxproj", "{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}" ProjectSection(ProjectDependencies) = postProject - {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} = {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} + {740F3007-7BF0-4C0C-8FA5-2587C794EF31} = {740F3007-7BF0-4C0C-8FA5-2587C794EF31} + {006A7908-ABF3-4D18-BC35-0A29E39B95F9} = {006A7908-ABF3-4D18-BC35-0A29E39B95F9} + {63050112-E486-4396-B5E4-303C3BC12D39} = {63050112-E486-4396-B5E4-303C3BC12D39} + {8804AD29-E398-480C-AC0F-98EC1B7A51CB} = {8804AD29-E398-480C-AC0F-98EC1B7A51CB} + {2A7F483F-CD19-4F84-BBDA-B6A1865E2773} = {2A7F483F-CD19-4F84-BBDA-B6A1865E2773} + {2C5AD347-6E34-463B-8289-00578E43B255} = {2C5AD347-6E34-463B-8289-00578E43B255} + {4A9F9353-DB63-460A-BB1C-9CB519DFD414} = {4A9F9353-DB63-460A-BB1C-9CB519DFD414} + {698C2D54-475C-446F-B879-F629BBEF75FE} = {698C2D54-475C-446F-B879-F629BBEF75FE} + {17077E86-AE7C-41AF-86ED-2BAC03B019BC} = {17077E86-AE7C-41AF-86ED-2BAC03B019BC} + {4478909E-6983-425C-9D9F-558CF258E61E} = {4478909E-6983-425C-9D9F-558CF258E61E} + {F67EB1EA-DCFA-4758-A2AA-4B570BA78036} = {F67EB1EA-DCFA-4758-A2AA-4B570BA78036} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "softmmu", "softmmu", "{857A09AF-FE20-461C-B66F-D779422AD46B}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aarch64-softmmu", "unicorn\aarch64-softmmu\aarch64-softmmu.vcxproj", "{2A7F483F-CD19-4F84-BBDA-B6A1865E2773}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arm-softmmu", "unicorn\arm-softmmu\arm-softmmu.vcxproj", "{F67EB1EA-DCFA-4758-A2AA-4B570BA78036}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "armeb-softmmu", "unicorn\armeb-softmmu\armeb-softmmu.vcxproj", "{740F3007-7BF0-4C0C-8FA5-2587C794EF31}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m68k-softmmu", "unicorn\m68k-softmmu\m68k-softmmu.vcxproj", "{2C5AD347-6E34-463B-8289-00578E43B255}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mips-softmmu", "unicorn\mips-softmmu\mips-softmmu.vcxproj", "{63050112-E486-4396-B5E4-303C3BC12D39}" @@ -40,16 +53,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparc-softmmu", "unicorn\sp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparc64-softmmu", "unicorn\sparc64-softmmu\sparc64-softmmu.vcxproj", "{8804AD29-E398-480C-AC0F-98EC1B7A51CB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "softmmu", "softmmu", "{857A09AF-FE20-461C-B66F-D779422AD46B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86_64-softmmu", "unicorn\x86_64-softmmu\x86_64-softmmu.vcxproj", "{17077E86-AE7C-41AF-86ED-2BAC03B019BC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F8E85E25-4D67-4A6B-A976-C920790B8798}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_arm", "samples\sample_arm\sample_arm.vcxproj", "{9F32C692-9106-43AF-A291-779A2D8BE096}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mem_apis", "samples\mem_apis\mem_apis.vcxproj", "{9D588288-5A28-4AB3-96EA-442CAA508F8E}" ProjectSection(ProjectDependencies) = postProject {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} = {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mem_apis", "samples\mem_apis\mem_apis.vcxproj", "{9D588288-5A28-4AB3-96EA-442CAA508F8E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_arm", "samples\sample_arm\sample_arm.vcxproj", "{9F32C692-9106-43AF-A291-779A2D8BE096}" ProjectSection(ProjectDependencies) = postProject {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} = {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} EndProjectSection @@ -79,6 +92,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_sparc", "samples\sam {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} = {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_x86", "samples\sample_x86\sample_x86.vcxproj", "{F8053D66-8267-433A-BF2C-E07E2298C338}" + ProjectSection(ProjectDependencies) = postProject + {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} = {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_x86_32_gdt_and_seg_regs", "samples\sample_x86_32_gdt_and_seg_regs\sample_x86_32_gdt_and_seg_regs.vcxproj", "{9D96D09A-DE17-4011-9247-F0009E8D6DB5}" ProjectSection(ProjectDependencies) = postProject {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} = {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} @@ -89,18 +107,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shellcode", "samples\shellc {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} = {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicorn", "unicorn\unicorn\unicorn.vcxproj", "{ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_armeb", "samples\sample_armeb\sample_armeb.vcxproj", "{1945F27B-ABB3-47F9-9268-A42F73C8B992}" ProjectSection(ProjectDependencies) = postProject - {006A7908-ABF3-4D18-BC35-0A29E39B95F9} = {006A7908-ABF3-4D18-BC35-0A29E39B95F9} - {63050112-E486-4396-B5E4-303C3BC12D39} = {63050112-E486-4396-B5E4-303C3BC12D39} - {8804AD29-E398-480C-AC0F-98EC1B7A51CB} = {8804AD29-E398-480C-AC0F-98EC1B7A51CB} - {2A7F483F-CD19-4F84-BBDA-B6A1865E2773} = {2A7F483F-CD19-4F84-BBDA-B6A1865E2773} - {2C5AD347-6E34-463B-8289-00578E43B255} = {2C5AD347-6E34-463B-8289-00578E43B255} - {4A9F9353-DB63-460A-BB1C-9CB519DFD414} = {4A9F9353-DB63-460A-BB1C-9CB519DFD414} - {698C2D54-475C-446F-B879-F629BBEF75FE} = {698C2D54-475C-446F-B879-F629BBEF75FE} - {17077E86-AE7C-41AF-86ED-2BAC03B019BC} = {17077E86-AE7C-41AF-86ED-2BAC03B019BC} - {4478909E-6983-425C-9D9F-558CF258E61E} = {4478909E-6983-425C-9D9F-558CF258E61E} - {F67EB1EA-DCFA-4758-A2AA-4B570BA78036} = {F67EB1EA-DCFA-4758-A2AA-4B570BA78036} + {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} = {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} EndProjectSection EndProject Global @@ -111,14 +120,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Win32.ActiveCfg = Debug|Win32 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Win32.Build.0 = Debug|Win32 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|x64.ActiveCfg = Debug|x64 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|x64.Build.0 = Debug|x64 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|Win32.ActiveCfg = Release|Win32 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|Win32.Build.0 = Release|Win32 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|x64.ActiveCfg = Release|x64 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|x64.Build.0 = Release|x64 + {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Debug|Win32.ActiveCfg = Debug|Win32 + {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Debug|Win32.Build.0 = Debug|Win32 + {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Debug|x64.ActiveCfg = Debug|x64 + {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Debug|x64.Build.0 = Debug|x64 + {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Release|Win32.ActiveCfg = Release|Win32 + {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Release|Win32.Build.0 = Release|Win32 + {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Release|x64.ActiveCfg = Release|x64 + {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Release|x64.Build.0 = Release|x64 {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Win32.ActiveCfg = Debug|Win32 {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Win32.Build.0 = Debug|Win32 {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|x64.ActiveCfg = Debug|x64 @@ -127,14 +136,6 @@ Global {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Release|Win32.Build.0 = Release|Win32 {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Release|x64.ActiveCfg = Release|x64 {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Release|x64.Build.0 = Release|x64 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|Win32.Build.0 = Debug|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|x64.ActiveCfg = Debug|x64 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|x64.Build.0 = Debug|x64 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|Win32.ActiveCfg = Release|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|Win32.Build.0 = Release|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|x64.ActiveCfg = Release|x64 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|x64.Build.0 = Release|x64 {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Debug|Win32.ActiveCfg = Debug|Win32 {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Debug|Win32.Build.0 = Debug|Win32 {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Debug|x64.ActiveCfg = Debug|x64 @@ -151,6 +152,14 @@ Global {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Release|Win32.Build.0 = Release|Win32 {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Release|x64.ActiveCfg = Release|x64 {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Release|x64.Build.0 = Release|x64 + {740F3007-7BF0-4C0C-8FA5-2587C794EF31}.Debug|Win32.ActiveCfg = Debug|Win32 + {740F3007-7BF0-4C0C-8FA5-2587C794EF31}.Debug|Win32.Build.0 = Debug|Win32 + {740F3007-7BF0-4C0C-8FA5-2587C794EF31}.Debug|x64.ActiveCfg = Debug|x64 + {740F3007-7BF0-4C0C-8FA5-2587C794EF31}.Debug|x64.Build.0 = Debug|x64 + {740F3007-7BF0-4C0C-8FA5-2587C794EF31}.Release|Win32.ActiveCfg = Release|Win32 + {740F3007-7BF0-4C0C-8FA5-2587C794EF31}.Release|Win32.Build.0 = Release|Win32 + {740F3007-7BF0-4C0C-8FA5-2587C794EF31}.Release|x64.ActiveCfg = Release|x64 + {740F3007-7BF0-4C0C-8FA5-2587C794EF31}.Release|x64.Build.0 = Release|x64 {2C5AD347-6E34-463B-8289-00578E43B255}.Debug|Win32.ActiveCfg = Debug|Win32 {2C5AD347-6E34-463B-8289-00578E43B255}.Debug|Win32.Build.0 = Debug|Win32 {2C5AD347-6E34-463B-8289-00578E43B255}.Debug|x64.ActiveCfg = Debug|x64 @@ -207,14 +216,14 @@ Global {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Release|Win32.Build.0 = Release|Win32 {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Release|x64.ActiveCfg = Release|x64 {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Release|x64.Build.0 = Release|x64 - {9F32C692-9106-43AF-A291-779A2D8BE096}.Debug|Win32.ActiveCfg = Debug|Win32 - {9F32C692-9106-43AF-A291-779A2D8BE096}.Debug|Win32.Build.0 = Debug|Win32 - {9F32C692-9106-43AF-A291-779A2D8BE096}.Debug|x64.ActiveCfg = Debug|x64 - {9F32C692-9106-43AF-A291-779A2D8BE096}.Debug|x64.Build.0 = Debug|x64 - {9F32C692-9106-43AF-A291-779A2D8BE096}.Release|Win32.ActiveCfg = Release|Win32 - {9F32C692-9106-43AF-A291-779A2D8BE096}.Release|Win32.Build.0 = Release|Win32 - {9F32C692-9106-43AF-A291-779A2D8BE096}.Release|x64.ActiveCfg = Release|x64 - {9F32C692-9106-43AF-A291-779A2D8BE096}.Release|x64.Build.0 = Release|x64 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Win32.ActiveCfg = Debug|Win32 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Win32.Build.0 = Debug|Win32 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|x64.ActiveCfg = Debug|x64 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|x64.Build.0 = Debug|x64 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|Win32.ActiveCfg = Release|Win32 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|Win32.Build.0 = Release|Win32 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|x64.ActiveCfg = Release|x64 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|x64.Build.0 = Release|x64 {9D588288-5A28-4AB3-96EA-442CAA508F8E}.Debug|Win32.ActiveCfg = Debug|Win32 {9D588288-5A28-4AB3-96EA-442CAA508F8E}.Debug|Win32.Build.0 = Debug|Win32 {9D588288-5A28-4AB3-96EA-442CAA508F8E}.Debug|x64.ActiveCfg = Debug|x64 @@ -223,6 +232,14 @@ Global {9D588288-5A28-4AB3-96EA-442CAA508F8E}.Release|Win32.Build.0 = Release|Win32 {9D588288-5A28-4AB3-96EA-442CAA508F8E}.Release|x64.ActiveCfg = Release|x64 {9D588288-5A28-4AB3-96EA-442CAA508F8E}.Release|x64.Build.0 = Release|x64 + {9F32C692-9106-43AF-A291-779A2D8BE096}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F32C692-9106-43AF-A291-779A2D8BE096}.Debug|Win32.Build.0 = Debug|Win32 + {9F32C692-9106-43AF-A291-779A2D8BE096}.Debug|x64.ActiveCfg = Debug|x64 + {9F32C692-9106-43AF-A291-779A2D8BE096}.Debug|x64.Build.0 = Debug|x64 + {9F32C692-9106-43AF-A291-779A2D8BE096}.Release|Win32.ActiveCfg = Release|Win32 + {9F32C692-9106-43AF-A291-779A2D8BE096}.Release|Win32.Build.0 = Release|Win32 + {9F32C692-9106-43AF-A291-779A2D8BE096}.Release|x64.ActiveCfg = Release|x64 + {9F32C692-9106-43AF-A291-779A2D8BE096}.Release|x64.Build.0 = Release|x64 {04DC0E3A-F247-45C2-AE27-8DE7493AA43B}.Debug|Win32.ActiveCfg = Debug|Win32 {04DC0E3A-F247-45C2-AE27-8DE7493AA43B}.Debug|Win32.Build.0 = Debug|Win32 {04DC0E3A-F247-45C2-AE27-8DE7493AA43B}.Debug|x64.ActiveCfg = Debug|x64 @@ -263,6 +280,14 @@ Global {A25CA34D-2F64-442B-A5D3-B13CB56C9957}.Release|Win32.Build.0 = Release|Win32 {A25CA34D-2F64-442B-A5D3-B13CB56C9957}.Release|x64.ActiveCfg = Release|x64 {A25CA34D-2F64-442B-A5D3-B13CB56C9957}.Release|x64.Build.0 = Release|x64 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|Win32.Build.0 = Debug|Win32 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|x64.ActiveCfg = Debug|x64 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|x64.Build.0 = Debug|x64 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|Win32.ActiveCfg = Release|Win32 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|Win32.Build.0 = Release|Win32 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|x64.ActiveCfg = Release|x64 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|x64.Build.0 = Release|x64 {9D96D09A-DE17-4011-9247-F0009E8D6DB5}.Debug|Win32.ActiveCfg = Debug|Win32 {9D96D09A-DE17-4011-9247-F0009E8D6DB5}.Debug|Win32.Build.0 = Debug|Win32 {9D96D09A-DE17-4011-9247-F0009E8D6DB5}.Debug|x64.ActiveCfg = Debug|x64 @@ -279,14 +304,14 @@ Global {F113B460-4B21-4014-9A15-D472FAA9E3F9}.Release|Win32.Build.0 = Release|Win32 {F113B460-4B21-4014-9A15-D472FAA9E3F9}.Release|x64.ActiveCfg = Release|x64 {F113B460-4B21-4014-9A15-D472FAA9E3F9}.Release|x64.Build.0 = Release|x64 - {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Debug|Win32.ActiveCfg = Debug|Win32 - {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Debug|Win32.Build.0 = Debug|Win32 - {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Debug|x64.ActiveCfg = Debug|x64 - {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Debug|x64.Build.0 = Debug|x64 - {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Release|Win32.ActiveCfg = Release|Win32 - {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Release|Win32.Build.0 = Release|Win32 - {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Release|x64.ActiveCfg = Release|x64 - {ACB78BBB-E8F4-4EAD-B981-9C6155DE100B}.Release|x64.Build.0 = Release|x64 + {1945F27B-ABB3-47F9-9268-A42F73C8B992}.Debug|Win32.ActiveCfg = Debug|Win32 + {1945F27B-ABB3-47F9-9268-A42F73C8B992}.Debug|Win32.Build.0 = Debug|Win32 + {1945F27B-ABB3-47F9-9268-A42F73C8B992}.Debug|x64.ActiveCfg = Debug|x64 + {1945F27B-ABB3-47F9-9268-A42F73C8B992}.Debug|x64.Build.0 = Debug|x64 + {1945F27B-ABB3-47F9-9268-A42F73C8B992}.Release|Win32.ActiveCfg = Release|Win32 + {1945F27B-ABB3-47F9-9268-A42F73C8B992}.Release|Win32.Build.0 = Release|Win32 + {1945F27B-ABB3-47F9-9268-A42F73C8B992}.Release|x64.ActiveCfg = Release|x64 + {1945F27B-ABB3-47F9-9268-A42F73C8B992}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -294,6 +319,7 @@ Global GlobalSection(NestedProjects) = preSolution {2A7F483F-CD19-4F84-BBDA-B6A1865E2773} = {857A09AF-FE20-461C-B66F-D779422AD46B} {F67EB1EA-DCFA-4758-A2AA-4B570BA78036} = {857A09AF-FE20-461C-B66F-D779422AD46B} + {740F3007-7BF0-4C0C-8FA5-2587C794EF31} = {857A09AF-FE20-461C-B66F-D779422AD46B} {2C5AD347-6E34-463B-8289-00578E43B255} = {857A09AF-FE20-461C-B66F-D779422AD46B} {63050112-E486-4396-B5E4-303C3BC12D39} = {857A09AF-FE20-461C-B66F-D779422AD46B} {4A9F9353-DB63-460A-BB1C-9CB519DFD414} = {857A09AF-FE20-461C-B66F-D779422AD46B} @@ -302,15 +328,16 @@ Global {698C2D54-475C-446F-B879-F629BBEF75FE} = {857A09AF-FE20-461C-B66F-D779422AD46B} {8804AD29-E398-480C-AC0F-98EC1B7A51CB} = {857A09AF-FE20-461C-B66F-D779422AD46B} {17077E86-AE7C-41AF-86ED-2BAC03B019BC} = {857A09AF-FE20-461C-B66F-D779422AD46B} - {F8053D66-8267-433A-BF2C-E07E2298C338} = {F8E85E25-4D67-4A6B-A976-C920790B8798} - {9F32C692-9106-43AF-A291-779A2D8BE096} = {F8E85E25-4D67-4A6B-A976-C920790B8798} {9D588288-5A28-4AB3-96EA-442CAA508F8E} = {F8E85E25-4D67-4A6B-A976-C920790B8798} + {9F32C692-9106-43AF-A291-779A2D8BE096} = {F8E85E25-4D67-4A6B-A976-C920790B8798} {04DC0E3A-F247-45C2-AE27-8DE7493AA43B} = {F8E85E25-4D67-4A6B-A976-C920790B8798} {7AA02EDF-D797-494B-929C-F628F4E4EA62} = {F8E85E25-4D67-4A6B-A976-C920790B8798} {11727C54-463F-472A-88AF-6C3D6071BF0B} = {F8E85E25-4D67-4A6B-A976-C920790B8798} {E34ECD90-3977-4A4B-9641-4D7F1766E9FD} = {F8E85E25-4D67-4A6B-A976-C920790B8798} {A25CA34D-2F64-442B-A5D3-B13CB56C9957} = {F8E85E25-4D67-4A6B-A976-C920790B8798} + {F8053D66-8267-433A-BF2C-E07E2298C338} = {F8E85E25-4D67-4A6B-A976-C920790B8798} {9D96D09A-DE17-4011-9247-F0009E8D6DB5} = {F8E85E25-4D67-4A6B-A976-C920790B8798} {F113B460-4B21-4014-9A15-D472FAA9E3F9} = {F8E85E25-4D67-4A6B-A976-C920790B8798} + {1945F27B-ABB3-47F9-9268-A42F73C8B992} = {F8E85E25-4D67-4A6B-A976-C920790B8798} EndGlobalSection EndGlobal diff --git a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj index 98c4a484..5530d7f1 100644 --- a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj +++ b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj @@ -19,7 +19,6 @@ - @@ -39,6 +38,7 @@ + diff --git a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters index 70ff0cce..fa81b5ac 100644 --- a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters +++ b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters @@ -1,8 +1,26 @@  - - + + {8a7d2815-3656-4ae7-8eb2-d38da6e8d480} + + + {9a7f2b42-3f31-4731-84e2-38f535304a1d} + + + {c74d3c4d-1f19-42c6-bf25-26820a53ac11} + + + {0e231806-86e4-4e05-8ef8-3e3d36860b00} + + + {ca50b33c-f5ce-4975-a702-c607bb2fc604} + + + {1db81436-53cf-4cb6-a474-e76327883bd2} + + + fpu @@ -30,7 +48,6 @@ tcg\i386 - target-arm @@ -61,6 +78,9 @@ target-arm + + + @@ -126,24 +146,4 @@ target-arm - - - {8a7d2815-3656-4ae7-8eb2-d38da6e8d480} - - - {ca50b33c-f5ce-4975-a702-c607bb2fc604} - - - {1db81436-53cf-4cb6-a474-e76327883bd2} - - - {9a7f2b42-3f31-4731-84e2-38f535304a1d} - - - {c74d3c4d-1f19-42c6-bf25-26820a53ac11} - - - {0e231806-86e4-4e05-8ef8-3e3d36860b00} - - \ No newline at end of file diff --git a/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj index 81828d9a..ed1e6ff5 100644 --- a/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj +++ b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj @@ -19,7 +19,6 @@ - @@ -38,6 +37,7 @@ + diff --git a/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj.filters b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj.filters index 21f4ff71..157e6e65 100644 --- a/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj.filters +++ b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj.filters @@ -1,8 +1,26 @@  - - + + {c29e2ed5-3ecd-426d-9245-04de2c8ce754} + + + {89b122b1-9e4c-41b1-8670-c6d9ee3716f6} + + + {76f837ed-af45-43bf-9ee7-193dbdec1cd5} + + + {1f03d4ae-6433-4037-a347-993db1a315e6} + + + {a9187bf5-cd27-47c7-8add-55b11a1150a9} + + + {015b3e43-eb63-4add-9f53-f3ac3033472f} + + + fpu @@ -30,7 +48,6 @@ tcg\i386 - target-arm @@ -58,6 +75,9 @@ target-arm + + + @@ -114,24 +134,4 @@ target-arm - - - {c29e2ed5-3ecd-426d-9245-04de2c8ce754} - - - {a9187bf5-cd27-47c7-8add-55b11a1150a9} - - - {015b3e43-eb63-4add-9f53-f3ac3033472f} - - - {89b122b1-9e4c-41b1-8670-c6d9ee3716f6} - - - {76f837ed-af45-43bf-9ee7-193dbdec1cd5} - - - {1f03d4ae-6433-4037-a347-993db1a315e6} - - \ No newline at end of file diff --git a/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj b/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj new file mode 100644 index 00000000..ccb812de --- /dev/null +++ b/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj @@ -0,0 +1,233 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + + + + + {740F3007-7BF0-4C0C-8FA5-2587C794EF31} + Win32Proj + armebsoftmmu + + + + StaticLibrary + true + v110_xp + MultiByte + + + StaticLibrary + true + v110_xp + MultiByte + + + StaticLibrary + false + v110_xp + false + MultiByte + + + StaticLibrary + false + v110_xp + false + MultiByte + + + + + + + + + + + + + + + + + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(ProjectDir)$(Platform)\$(Configuration)\ + + + $(ProjectDir)$(Platform)\$(Configuration)\ + + + $(ProjectDir)$(Platform)\$(Configuration)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN + .;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include + /wd4018 /wd4244 /wd4267 %(AdditionalOptions) + MultiThreadedDebug + false + armeb.h + + + Windows + true + + + ..\prebuild_script.bat + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN + .;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include + /wd4018 /wd4244 /wd4267 %(AdditionalOptions) + MultiThreadedDebug + false + armeb.h + + + Windows + true + + + ..\prebuild_script.bat + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN + .;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include + /wd4018 /wd4244 /wd4267 %(AdditionalOptions) + MultiThreaded + false + armeb.h + None + + + Windows + true + true + true + + + ..\prebuild_script.bat + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN + .;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include + /wd4018 /wd4244 /wd4267 %(AdditionalOptions) + MultiThreaded + false + armeb.h + None + + + Windows + true + true + true + + + ..\prebuild_script.bat + + + + + + \ No newline at end of file diff --git a/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj.filters b/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj.filters new file mode 100644 index 00000000..c85b4489 --- /dev/null +++ b/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj.filters @@ -0,0 +1,137 @@ + + + + + {5c1c56e9-7777-47ee-b021-c79bd6ad8c38} + + + {9c860878-f381-4c2e-86db-b7ba81b46c10} + + + {2f89d71a-2c88-497f-960b-42c3ac537df4} + + + {31088e8b-a2b5-4e0a-a288-4f9c537c350a} + + + {56559ccc-d240-4e06-b74b-8bd230f7fe07} + + + {b6c188d2-6b51-4697-ade2-a3c42f88a39d} + + + + + fpu + + + fpu + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg\i386 + + + + + + + + fpu + + + hw\arm + + + hw\arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + target-arm + + + tcg + + + tcg + + + tcg\i386 + + + + + + + + + + + \ No newline at end of file diff --git a/msvc/unicorn/armeb-softmmu/config-target.h b/msvc/unicorn/armeb-softmmu/config-target.h new file mode 100644 index 00000000..8c271122 --- /dev/null +++ b/msvc/unicorn/armeb-softmmu/config-target.h @@ -0,0 +1,6 @@ +/* Automatically generated by create_config - do not modify */ +#define TARGET_ARM 1 +#define TARGET_NAME "armeb" +#define TARGET_ARM 1 +#define TARGET_WORDS_BIGENDIAN 1 +#define CONFIG_SOFTMMU 1 diff --git a/msvc/unicorn/config-host.h b/msvc/unicorn/config-host.h index 6620071c..15adc1d0 100644 --- a/msvc/unicorn/config-host.h +++ b/msvc/unicorn/config-host.h @@ -1,5 +1,6 @@ /* Automatically generated by create_config - do not modify */ -#define HOST_X86_64 1 -#define CONFIG_POSIX 1 -#define CONFIG_BSD 1 +#define HOST_I386 1 +#define CONFIG_WIN32 1 +#define CONFIG_FILEVERSION 2,2,1,0 +#define CONFIG_PRODUCTVERSION 2,2,1,0 #define CONFIG_CPUID_H 1 diff --git a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj index 9b539196..0ed9725e 100644 --- a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj +++ b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj @@ -18,6 +18,25 @@ x64 + + + + + + + + + + + + + + + + + + + @@ -43,25 +62,6 @@ - - - - - - - - - - - - - - - - - - - {2C5AD347-6E34-463B-8289-00578E43B255} Win32Proj diff --git a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters index c07af74e..f3487108 100644 --- a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters +++ b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters @@ -7,18 +7,65 @@ {14f99bfc-becf-403c-9100-1612ab30a848} - - {63d2e327-f759-4757-a44b-90513ce433f7} - - - {574ebec7-47db-49de-8f59-3365337e42a7} - {484590c4-abd5-4db4-8b06-b34087856c27} {476366de-d432-4ce4-8e04-64aa34326aa0} + + {63d2e327-f759-4757-a44b-90513ce433f7} + + + {574ebec7-47db-49de-8f59-3365337e42a7} + + + + + fpu + + + fpu + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg\i386 + + + target-m68k + + + target-m68k + + + target-m68k + + + target-m68k + + + target-m68k + + + + @@ -60,51 +107,4 @@ target-m68k - - - fpu - - - fpu - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg\i386 - - - - - target-m68k - - - target-m68k - - - target-m68k - - - target-m68k - - - target-m68k - - - \ No newline at end of file diff --git a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj index af458a9d..0b76d879 100644 --- a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj +++ b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj @@ -18,6 +18,25 @@ x64 + + + + + + + + + + + + + + + + + + + @@ -54,25 +73,6 @@ - - - - - - - - - - - - - - - - - - - {63050112-E486-4396-B5E4-303C3BC12D39} Win32Proj diff --git a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters index e0410ec1..893a2551 100644 --- a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters +++ b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters @@ -7,6 +7,9 @@ {19efec2a-ac41-4941-9dfc-4937f91829b4} + + {0784e023-e00c-4034-adc4-9b1ad07d2eb7} + {d60f24b3-d409-40d8-b7d2-f3e71960841a} @@ -16,9 +19,53 @@ {65e8fb9c-fe61-4100-9f0e-1eab5babb4d3} - - {0784e023-e00c-4034-adc4-9b1ad07d2eb7} - + + + + fpu + + + fpu + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg\i386 + + + target-mips + + + target-mips + + + target-mips + + + target-mips + + + target-mips + + + + @@ -78,51 +125,4 @@ target-mips - - - - - fpu - - - fpu - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg\i386 - - - target-mips - - - target-mips - - - target-mips - - - target-mips - - - target-mips - - - \ No newline at end of file diff --git a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj index 94ce5bd9..3cdf65ac 100644 --- a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj +++ b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj @@ -21,7 +21,6 @@ - @@ -34,6 +33,7 @@ + diff --git a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters index cf105ff7..c5aac694 100644 --- a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters +++ b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters @@ -1,8 +1,26 @@  - - + + {d5143bfc-0d98-4c10-aa97-eddbc37aca5e} + + + {c27c2a6c-adb5-4f4a-ae2d-778d1aff259e} + + + {39b8b5d5-ffa1-4eb6-ab78-2edb05e49e84} + + + {a4e58c5f-5143-4c18-b291-2f472259d6d9} + + + {bbe2ce8b-4fcd-496e-9f45-6f65ada00d84} + + + {3c66ada6-0f5f-40f5-a62c-c6dee6596791} + + + fpu @@ -45,6 +63,8 @@ target-mips + + @@ -105,24 +125,4 @@ target-mips - - - {d5143bfc-0d98-4c10-aa97-eddbc37aca5e} - - - {c27c2a6c-adb5-4f4a-ae2d-778d1aff259e} - - - {39b8b5d5-ffa1-4eb6-ab78-2edb05e49e84} - - - {bbe2ce8b-4fcd-496e-9f45-6f65ada00d84} - - - {3c66ada6-0f5f-40f5-a62c-c6dee6596791} - - - {a4e58c5f-5143-4c18-b291-2f472259d6d9} - - \ No newline at end of file diff --git a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj index 68bb2bdb..0c4082f1 100644 --- a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj +++ b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj @@ -21,7 +21,6 @@ - @@ -34,6 +33,7 @@ + diff --git a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters index c2a1926e..88aa508a 100644 --- a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters +++ b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters @@ -1,8 +1,26 @@  - - + + {2b2b58ad-804f-435b-b55d-1c21e050cf31} + + + {a6046583-2534-498c-9bd2-08dd8c222c18} + + + {2253570a-0bc0-4366-9eab-095257ab37b2} + + + {de33cbbc-f374-4451-a083-23c5a98c843e} + + + {b4ef3640-fe65-476d-9b4f-3c6d82a5dbfd} + + + {95533292-741a-46c5-a003-cbb60c8654ce} + + + fpu @@ -45,6 +63,8 @@ target-mips + + @@ -105,24 +125,4 @@ target-mips - - - {2b2b58ad-804f-435b-b55d-1c21e050cf31} - - - {a6046583-2534-498c-9bd2-08dd8c222c18} - - - {2253570a-0bc0-4366-9eab-095257ab37b2} - - - {b4ef3640-fe65-476d-9b4f-3c6d82a5dbfd} - - - {95533292-741a-46c5-a003-cbb60c8654ce} - - - {de33cbbc-f374-4451-a083-23c5a98c843e} - - \ No newline at end of file diff --git a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj index ed3ba2e0..9b2f9f26 100644 --- a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj +++ b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj @@ -21,7 +21,6 @@ - @@ -34,6 +33,7 @@ + diff --git a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters index af4a067e..3ec346fb 100644 --- a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters +++ b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters @@ -1,8 +1,26 @@  - - + + {00b0caab-f50f-47a1-99ea-a452f1e712e3} + + + {f666e049-ed32-4817-9998-b6898ce2b71a} + + + {b2a1fb8b-789a-45a6-a814-9312ad75bd70} + + + {e6bea1c8-7307-44c8-9956-25321f73287f} + + + {cce3d221-0ae7-4cea-a9bd-5fe10a932c20} + + + {9b5981d1-89fd-4210-ac4d-7b3dab34871b} + + + fpu @@ -45,6 +63,8 @@ target-mips + + @@ -105,24 +125,4 @@ - - - {00b0caab-f50f-47a1-99ea-a452f1e712e3} - - - {f666e049-ed32-4817-9998-b6898ce2b71a} - - - {b2a1fb8b-789a-45a6-a814-9312ad75bd70} - - - {cce3d221-0ae7-4cea-a9bd-5fe10a932c20} - - - {9b5981d1-89fd-4210-ac4d-7b3dab34871b} - - - {e6bea1c8-7307-44c8-9956-25321f73287f} - - \ No newline at end of file diff --git a/msvc/unicorn/prebuild_script.bat b/msvc/unicorn/prebuild_script.bat index c421fc5a..ae001481 100644 --- a/msvc/unicorn/prebuild_script.bat +++ b/msvc/unicorn/prebuild_script.bat @@ -8,6 +8,7 @@ del ..\..\qemu\config-host.h 2> null del ..\..\qemu\aarch-softmmu\config-target.h 2> null del ..\..\qemu\arm-softmmu\config-target.h 2> null +del ..\..\qemu\armeb-softmmu\config-target.h 2> null del ..\..\qemu\m68k-softmmu\config-target.h 2> null del ..\..\qemu\mips64el-softmmu\config-target.h 2> null del ..\..\qemu\mips64-softmmu\config-target.h 2> null diff --git a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj index eed066ac..b4c3bbd1 100644 --- a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj +++ b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj @@ -18,6 +18,24 @@ x64 + + + + + + + + + + + + + + + + + + @@ -48,24 +66,6 @@ - - - - - - - - - - - - - - - - - - {698C2D54-475C-446F-B879-F629BBEF75FE} Win32Proj diff --git a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters index 585584ce..95458e1d 100644 --- a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters +++ b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters @@ -7,18 +7,62 @@ {dec3e9f1-0fc3-454e-ae70-78d866b5c3f8} - - {b229bf2b-cc40-4135-b3b7-40c73bd9f597} - - - {133a0d6a-6f71-4d4b-be6d-f90636aa02a2} - {0a04b798-735c-4115-ab62-b6cfc772efed} {10f0c533-e16b-4e31-b979-812af068bb36} + + {b229bf2b-cc40-4135-b3b7-40c73bd9f597} + + + {133a0d6a-6f71-4d4b-be6d-f90636aa02a2} + + + + + fpu + + + fpu + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg\i386 + + + target-sparc + + + target-sparc + + + target-sparc + + + target-sparc + + + + @@ -75,48 +119,4 @@ target-sparc - - - fpu - - - fpu - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg\i386 - - - - - target-sparc - - - target-sparc - - - target-sparc - - - target-sparc - - - \ No newline at end of file diff --git a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj index 90a00848..46ee7ac6 100644 --- a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj +++ b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj @@ -18,6 +18,24 @@ x64 + + + + + + + + + + + + + + + + + + @@ -49,24 +67,6 @@ - - - - - - - - - - - - - - - - - - {8804AD29-E398-480C-AC0F-98EC1B7A51CB} Win32Proj diff --git a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters index 67c5aa92..cf669e84 100644 --- a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters +++ b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters @@ -1,24 +1,68 @@  - - {1f15e2b2-fae3-41e5-b787-70c44beb828c} - {ee6a3abf-6f14-47ab-8b40-f859d030230a} {4a271b0a-7736-4457-98f8-8c21ad4d2601} + + {46e355ab-da0b-431b-929b-8d77b3ab90bc} + + + {1f15e2b2-fae3-41e5-b787-70c44beb828c} + {7c7b0370-fe65-4c21-94e6-f4561470087d} {51a4ddc6-4078-4db0-9b29-c68c558b2f93} - - {46e355ab-da0b-431b-929b-8d77b3ab90bc} - + + + + fpu + + + fpu + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg\i386 + + + target-sparc + + + target-sparc + + + target-sparc + + + target-sparc + + + + @@ -78,48 +122,4 @@ hw\sparc64 - - - fpu - - - fpu - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg\i386 - - - - - target-sparc - - - target-sparc - - - target-sparc - - - target-sparc - - - \ No newline at end of file diff --git a/msvc/unicorn/unicorn/unicorn.vcxproj b/msvc/unicorn/unicorn/unicorn.vcxproj index 441e695a..e9788be1 100644 --- a/msvc/unicorn/unicorn/unicorn.vcxproj +++ b/msvc/unicorn/unicorn/unicorn.vcxproj @@ -1,4 +1,4 @@ - + @@ -99,7 +99,7 @@ Windows true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);aarch64-softmmu.lib;arm-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);aarch64-softmmu.lib;arm-softmmu.lib;armeb-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib $(SolutionDir)$(Platform)\$(Configuration)\ @@ -117,7 +117,7 @@ Windows true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);aarch64-softmmu.lib;arm-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);aarch64-softmmu.lib;arm-softmmu.lib;armeb-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib $(SolutionDir)$(Platform)\$(Configuration)\ @@ -140,7 +140,7 @@ true true true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);aarch64-softmmu.lib;arm-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);aarch64-softmmu.lib;arm-softmmu.lib;armeb-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib $(SolutionDir)$(Platform)\$(Configuration)\ @@ -175,7 +175,7 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\ true true true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);aarch64-softmmu.lib;arm-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);aarch64-softmmu.lib;arm-softmmu.lib;armeb-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib $(SolutionDir)$(Platform)\$(Configuration)\ @@ -359,4 +359,4 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\ - + \ No newline at end of file diff --git a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj index 55776960..eb5b9ef8 100644 --- a/msvc/unicorn/unicorn_static/unicorn_static.vcxproj +++ b/msvc/unicorn/unicorn_static/unicorn_static.vcxproj @@ -1,4 +1,4 @@ - + @@ -250,7 +250,7 @@ $(SolutionDir)$(Platform)\$(Configuration)\ - aarch64-softmmu.lib;arm-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib + aarch64-softmmu.lib;arm-softmmu.lib;armeb-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib ..\prebuild_script.bat @@ -274,7 +274,7 @@ $(SolutionDir)$(Platform)\$(Configuration)\ - aarch64-softmmu.lib;arm-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib + aarch64-softmmu.lib;arm-softmmu.lib;armeb-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib ..\prebuild_script.bat @@ -303,7 +303,7 @@ $(SolutionDir)$(Platform)\$(Configuration)\ - aarch64-softmmu.lib;arm-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib + aarch64-softmmu.lib;arm-softmmu.lib;armeb-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib ..\prebuild_script.bat @@ -343,7 +343,7 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\ $(SolutionDir)$(Platform)\$(Configuration)\ - aarch64-softmmu.lib;arm-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib + aarch64-softmmu.lib;arm-softmmu.lib;armeb-softmmu.lib;m68k-softmmu.lib;mips-softmmu.lib;mips64-softmmu.lib;mipsel-softmmu.lib;mips64el-softmmu.lib;sparc-softmmu.lib;sparc64-softmmu.lib;x86_64-softmmu.lib ..\prebuild_script.bat @@ -363,4 +363,4 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\ - + \ No newline at end of file diff --git a/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj index 8825faf2..1e9670c4 100644 --- a/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj +++ b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj @@ -18,6 +18,30 @@ x64 + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,30 +79,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - {17077E86-AE7C-41AF-86ED-2BAC03B019BC} Win32Proj diff --git a/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj.filters b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj.filters index 99c047de..2ee64ced 100644 --- a/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj.filters +++ b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj.filters @@ -23,6 +23,68 @@ {9b7b99b2-982e-46b5-aff2-1ff3a353d3db} + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + tcg + + + fpu + + + fpu + + + target-i386 + + + tcg\i386 + + + target-i386 + + + target-i386 + + + target-i386 + + + target-i386 + + + target-i386 + + + target-i386 + + + target-i386 + + + target-i386 + + + target-i386 + + + + + @@ -99,66 +161,4 @@ tcg\i386 - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg - - - tcg - - - fpu - - - fpu - - - target-i386 - - - - tcg\i386 - - - - target-i386 - - - target-i386 - - - target-i386 - - - target-i386 - - - target-i386 - - - target-i386 - - - target-i386 - - - target-i386 - - - target-i386 - - - \ No newline at end of file diff --git a/samples/sample_armeb.c b/samples/sample_armeb.c index e59ce8b8..78bc42bc 100644 --- a/samples/sample_armeb.c +++ b/samples/sample_armeb.c @@ -1,30 +1,10 @@ /* Unicorn Emulator Engine */ /* By zhangwm, 2017 */ -/* Sample code to demonstrate how to emulate ARM code */ +/* Sample code to demonstrate how to emulate ARM Big Endian code */ -// windows specific -#ifdef _MSC_VER -#include -#include -#define PRIx64 "llX" -#ifdef DYNLOAD -#include "unicorn_dynload.h" -#else // DYNLOAD #include -#ifdef _WIN64 -#pragma comment(lib, "unicorn_staload64.lib") -#else // _WIN64 -#pragma comment(lib, "unicorn_staload.lib") -#endif // _WIN64 -#endif // DYNLOAD - -// posix specific -#else // _MSC_VER -#include -#include -#include -#endif // _MSC_VER +#include // code to be emulated