From 72c97ee6d78713e9f758a19af4baf26029565ad0 Mon Sep 17 00:00:00 2001 From: MyvarHD Date: Sat, 20 Dec 2014 15:46:09 +0200 Subject: [PATCH 1/2] Fixed tab order of options page --- .../Emile/TestBed/TestBed/TestBedBoot.Cosmos | 47 +- .../Cosmos.VS.Package/CosmosPage.Designer.cs | 1702 ++++++++--------- source/Cosmos.VS.Package/CosmosPage.cs | 1280 ++++++------- source/Cosmos.VS.Package/CosmosPage.resx | 334 ++-- 4 files changed, 1700 insertions(+), 1663 deletions(-) diff --git a/Users/Emile/TestBed/TestBed/TestBedBoot.Cosmos b/Users/Emile/TestBed/TestBed/TestBedBoot.Cosmos index e7002f745..1ef22f3ec 100644 --- a/Users/Emile/TestBed/TestBed/TestBedBoot.Cosmos +++ b/Users/Emile/TestBed/TestBed/TestBedBoot.Cosmos @@ -1,4 +1,4 @@ - + Debug @@ -14,7 +14,7 @@ - true + True Source User False @@ -26,6 +26,43 @@ ISO VMware Pipe: Cosmos\Serial + True + TestBedBoot + Use VMware Player or Workstation to deploy and debug. + ISO + VMware + True + True + Source + Pipe: Cosmos\Serial + Player + bin\Debug\ + False + false + TestBedBoot + Creates a PXE setup and hosts a DCHP and TFTP server to deploy directly to physical hardware. Allows debugging with a serial cable. + PXE + None + False + True + Source + Pipe: Cosmos\Serial + Player + bin\Debug\ + False + false + TestBedBoot + Creates a bootable ISO image which can be burned to a DVD. After running the selected project, an explorer window will open containing the ISO file. The ISO file can then be burned to a CD or DVD and used to boot a physical or virtual system. + ISO + None + False + True + Source + Pipe: Cosmos\Serial + Player + bin\Debug\ + False + false @@ -34,9 +71,9 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH - Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++ - 79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S - +1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO - rpQkVqdXfOz0bWAcVLghfaXxkUz3y2VxvpMGSwL3uMKh+gHezSSLEnNhX23vtYzKUirDfGyFj/Iy1mdx - UWqR8iKhwtQLxjgH659y4EwvVXWPiwJt3/Ws+muywRrlqvkDdx3zQrCN8l1ldnEd3/QqFmkS/akHJYGS - zjLzOUEwEsMf+sLI2zmaOou/93pPGoM5zvk7UU7fnBKxSBPoT7SXBNW1F/9Io2lKCNTCeomUyrS8xnBA - wfUqyf1eP5U1ptJD/o1LzeNCsHPydtqdr6k4aiwvOHvNSya3ibU/QIdrEkvfhJislc32MfYfuV1eUGPw - FF7bIVJVZ0N/soPK421UHGstlFvYd/hWecF/Qqf7CR0A5wwgSQA2AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH8SURBVDhPnZJtS1NhGMf3GQqqV1GQRQ+o5WqbbmcP5dwK - SiIsFqwXBS32QmYNpJjl5rL6BEHPlCGCYBREWW6ZGGpu5jBXahtbe1LzK/w659iUcU4v6sX/hvvm/7uv - i+v6a0rLK/yvZHgiFqfN7yc6/JHi0i9Vo5o0hcVlnvf2YbUeweF08vrNW6Q3NXO+tMRM8hvPenrku0Z6 - 6O3rp9V3GZ3BhNVm5/6DR4oPsvkS7yIfaD7RTDAUXoWlIzn3g5HRMXxtfuqNZgSzhY5AgEyu8Acscr2z - E4utke5bd0hnc+twWfniIo+fPMV22I4g2Ah2hRmbiNEVvo3JaKTjRoiFdHbNr5i2NLDYVAL3ufMc0jWg - 0xsxmQUueLxiJ8UK719XNfg+Qp3WgKHehN1xjLmFtMKjCk/PzOI4epzqmgPU1GrRHtRjb3IqfAo4IYJS - pd17qrl4yctQdJgzLje1++u4e+9hhbcCnv0+T5NYcev2Klxn3WKrKXmyknxX2tHrG0h8TSrhbKGEx9vK - jl37sFgbGf8cXzNlxFXNpzKcPNUiJrFdDksF3D/wgk1btlG1cy/BcDepzOouy5JCMzk1jdEkEP+SkO8y - /FP8+eq1ABs2bqbltItP45OqEZUqBkM3GRyKrMOSoiOjeMQBDbx8JQYhowDLyolBUk3Yv2mF35ElDFrI - IuM7AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH + Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++ + 79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S + +1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO + rpQkVqdXfOz0bWAcVLghfaXxkUz3y2VxvpMGSwL3uMKh+gHezSSLEnNhX23vtYzKUirDfGyFj/Iy1mdx + UWqR8iKhwtQLxjgH659y4EwvVXWPiwJt3/Ws+muywRrlqvkDdx3zQrCN8l1ldnEd3/QqFmkS/akHJYGS + zjLzOUEwEsMf+sLI2zmaOou/93pPGoM5zvk7UU7fnBKxSBPoT7SXBNW1F/9Io2lKCNTCeomUyrS8xnBA + wfUqyf1eP5U1ptJD/o1LzeNCsHPydtqdr6k4aiwvOHvNSya3ibU/QIdrEkvfhJislc32MfYfuV1eUGPw + FF7bIVJVZ0N/soPK421UHGstlFvYd/hWecF/Qqf7CR0A5wwgSQA2AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAA8AAAAQCAYAAADJViUEAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH8SURBVDhPnZJtS1NhGMf3GQqqV1GQRQ+o5WqbbmcP5dwK + SiIsFqwXBS32QmYNpJjl5rL6BEHPlCGCYBREWW6ZGGpu5jBXahtbe1LzK/w659iUcU4v6sX/hvvm/7uv + i+v6a0rLK/yvZHgiFqfN7yc6/JHi0i9Vo5o0hcVlnvf2YbUeweF08vrNW6Q3NXO+tMRM8hvPenrku0Z6 + 6O3rp9V3GZ3BhNVm5/6DR4oPsvkS7yIfaD7RTDAUXoWlIzn3g5HRMXxtfuqNZgSzhY5AgEyu8Acscr2z + E4utke5bd0hnc+twWfniIo+fPMV22I4g2Ah2hRmbiNEVvo3JaKTjRoiFdHbNr5i2NLDYVAL3ufMc0jWg + 0xsxmQUueLxiJ8UK719XNfg+Qp3WgKHehN1xjLmFtMKjCk/PzOI4epzqmgPU1GrRHtRjb3IqfAo4IYJS + pd17qrl4yctQdJgzLje1++u4e+9hhbcCnv0+T5NYcev2Klxn3WKrKXmyknxX2tHrG0h8TSrhbKGEx9vK + jl37sFgbGf8cXzNlxFXNpzKcPNUiJrFdDksF3D/wgk1btlG1cy/BcDepzOouy5JCMzk1jdEkEP+SkO8y + /FP8+eq1ABs2bqbltItP45OqEZUqBkM3GRyKrMOSoiOjeMQBDbx8JQYhowDLyolBUk3Yv2mF35ElDFrI + IuM7AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + \ No newline at end of file From 906c5565b555fb2cfe008847b7b3358806fec58c Mon Sep 17 00:00:00 2001 From: MyvarHD Date: Sat, 20 Dec 2014 17:48:59 +0200 Subject: [PATCH 2/2] Added unbox opcode --- source/Cosmos.IL2CPU/ILOpCodes/OpType.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/Cosmos.IL2CPU/ILOpCodes/OpType.cs b/source/Cosmos.IL2CPU/ILOpCodes/OpType.cs index 174ddac5f..a863c9ebb 100644 --- a/source/Cosmos.IL2CPU/ILOpCodes/OpType.cs +++ b/source/Cosmos.IL2CPU/ILOpCodes/OpType.cs @@ -42,6 +42,8 @@ namespace Cosmos.IL2CPU.ILOpCodes { return 0; case Code.Unbox_Any: return 1; + case Code.Unbox: + return 1; default: throw new NotImplementedException("OpCode '" + OpCode + "' not implemented! Encountered in method " + aMethod.ToString()); } @@ -71,6 +73,8 @@ namespace Cosmos.IL2CPU.ILOpCodes { return 0; case Code.Unbox_Any: return 1; + case Code.Unbox: + return 1; default: throw new NotImplementedException("OpCode '" + OpCode + "' not implemented!"); } @@ -102,6 +106,9 @@ namespace Cosmos.IL2CPU.ILOpCodes { case Code.Unbox_Any: StackPushTypes[0] = Value; return; + case Code.Unbox: + StackPushTypes[0] = Value; + return; case Code.Newarr: StackPushTypes[0] = Value.MakeArrayType(); return;