1 | | the following changesets are requried internally for build purposes on trunk ( r137774 r137761 r137760) and 6.1 ( r137793 r137904 ). |
| 1 | the following changesets are requried internally for build purposes on trunk ( r137774 r137761 r137760) and 6.1 ( r137793 r137904 r138060). |
| 2 | |
| 3 | r137760 & r138060 are:[[BR]] |
| 4 | dbgcMachoCpuType: the type and sub-types are int32_t not uint32_t. |
| 5 | {{{ |
| 6 | Index: trunk/src/VBox/Debugger/DBGCDumpImage.cpp |
| 7 | =================================================================== |
| 8 | --- trunk/src/VBox/Debugger/DBGCDumpImage.cpp (revision 137759) |
| 9 | +++ trunk/src/VBox/Debugger/DBGCDumpImage.cpp (revision 137760) |
| 10 | @@ -464,16 +464,16 @@ |
| 11 | } |
| 12 | |
| 13 | |
| 14 | -static const char *dbgcMachoCpuType(uint32_t uType, uint32_t uSubType) |
| 15 | +static const char *dbgcMachoCpuType(int32_t iType, int32_t iSubType) |
| 16 | { |
| 17 | - switch (uType) |
| 18 | + switch (iType) |
| 19 | { |
| 20 | case CPU_TYPE_ANY: return "CPU_TYPE_ANY"; |
| 21 | case CPU_TYPE_VAX: return "VAX"; |
| 22 | case CPU_TYPE_MC680x0: return "MC680x0"; |
| 23 | case CPU_TYPE_X86: return "X86"; |
| 24 | case CPU_TYPE_X86_64: |
| 25 | - switch (uSubType) |
| 26 | + switch (iSubType) |
| 27 | { |
| 28 | case CPU_SUBTYPE_X86_64_ALL: return "X86_64/ALL64"; |
| 29 | }}}} |