Merge pull request #215 from npdmfixup/npdmfixup

Use new npdm-json format
This commit is contained in:
SciresM 2018-10-31 18:03:32 +09:00 committed by GitHub
commit 865ca76772
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 659 additions and 522 deletions

View file

@ -5,9 +5,14 @@
"main_thread_priority": 27, "main_thread_priority": 27,
"default_cpu_id": 3, "default_cpu_id": 3,
"process_category": 1, "process_category": 1,
"kernel_capabilities" : { "kernel_capabilities": [
"handle_table_size" : 128, {
"syscalls" : { "type": "handle_table_size",
"value": 128
},
{
"type": "syscalls",
"value": {
"svcSetHeapSize": "0x01", "svcSetHeapSize": "0x01",
"svcSetMemoryPermission": "0x02", "svcSetMemoryPermission": "0x02",
"svcSetMemoryAttribute": "0x03", "svcSetMemoryAttribute": "0x03",
@ -57,63 +62,109 @@
"svcMapDeviceAddressSpaceAligned": "0x5A", "svcMapDeviceAddressSpaceAligned": "0x5A",
"svcUnmapDeviceAddressSpace": "0x5C", "svcUnmapDeviceAddressSpace": "0x5C",
"svcFlushProcessDataCache": "0x5F" "svcFlushProcessDataCache": "0x5F"
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x50003000", "address": "0x50003000",
"size": "0x1000", "size": "0x1000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x54200000", "address": "0x54200000",
"size": "0x3000", "size": "0x3000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x54300000", "address": "0x54300000",
"size": "0x1000", "size": "0x1000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x60006000", "address": "0x60006000",
"size": "0x1000", "size": "0x1000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x6000D000", "address": "0x6000D000",
"size": "0x1000", "size": "0x1000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x70000000", "address": "0x70000000",
"size": "0x4000", "size": "0x4000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x7000C000", "address": "0x7000C000",
"size": "0x2000", "size": "0x2000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x7000E000", "address": "0x7000E000",
"size": "0x4000", "size": "0x4000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x700E3000", "address": "0x700E3000",
"size": "0x1000", "size": "0x1000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"irq_pair" : [70, 116], {
"irq_pair" : [124, 152], "type": "irq_pair",
"irq_pair" : [85, 95] "value": [
70,
116
]
},
{
"type": "irq_pair",
"value": [
124,
152
]
},
{
"type": "irq_pair",
"value": [
85,
95
]
} }
]
} }

View file

@ -5,9 +5,14 @@
"main_thread_priority": 27, "main_thread_priority": 27,
"default_cpu_id": 3, "default_cpu_id": 3,
"process_category": 1, "process_category": 1,
"kernel_capabilities" : { "kernel_capabilities": [
"handle_table_size" : 128, {
"syscalls" : { "type": "handle_table_size",
"value": 128
},
{
"type": "syscalls",
"value": {
"svcSetHeapSize": "0x01", "svcSetHeapSize": "0x01",
"svcSetMemoryPermission": "0x02", "svcSetMemoryPermission": "0x02",
"svcSetMemoryAttribute": "0x03", "svcSetMemoryAttribute": "0x03",
@ -60,57 +65,100 @@
"svcMapDeviceAddressSpaceAligned": "0x5A", "svcMapDeviceAddressSpaceAligned": "0x5A",
"svcUnmapDeviceAddressSpace": "0x5C", "svcUnmapDeviceAddressSpace": "0x5C",
"svcFlushProcessDataCache": "0x5F" "svcFlushProcessDataCache": "0x5F"
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x50003000", "address": "0x50003000",
"size": "0x1000", "size": "0x1000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x54200000", "address": "0x54200000",
"size": "0x3000", "size": "0x3000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x54300000", "address": "0x54300000",
"size": "0x1000", "size": "0x1000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x60006000", "address": "0x60006000",
"size": "0x1000", "size": "0x1000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x6000D000", "address": "0x6000D000",
"size": "0x1000", "size": "0x1000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x70000000", "address": "0x70000000",
"size": "0x4000", "size": "0x4000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x7000C000", "address": "0x7000C000",
"size": "0x2000", "size": "0x2000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"map" : { {
"type": "map",
"value": {
"address": "0x700E3000", "address": "0x700E3000",
"size": "0x1000", "size": "0x1000",
"is_ro": false, "is_ro": false,
"is_io": true "is_io": true
}
}, },
"irq_pair" : [70, 116], {
"irq_pair" : [124, 152], "type": "irq_pair",
"irq_pair" : [85, 95] "value": [
70,
116
]
},
{
"type": "irq_pair",
"value": [
124,
152
]
},
{
"type": "irq_pair",
"value": [
85,
95
]
} }
]
} }

View file

@ -14,22 +14,29 @@
"filesystem_access": { "filesystem_access": {
"permissions": "0xFFFFFFFFFFFFFFFF" "permissions": "0xFFFFFFFFFFFFFFFF"
}, },
"service_access": { "service_host": [
"csrng": false, "time:s"
"erpt:c": false, ],
"fatal:u": false, "service_access": [
"ns:dev": false, "csrng",
"fsp-srv": false, "erpt:c",
"time:s": true "fatal:u",
}, "ns:dev",
"kernel_capabilities": { "fsp-srv"
"kernel_flags": { ],
"kernel_capabilities": [
{
"type": "kernel_flags",
"value": {
"highest_thread_priority": 63, "highest_thread_priority": 63,
"lowest_thread_priority": 24, "lowest_thread_priority": 24,
"lowest_cpu_id": 3, "lowest_cpu_id": 3,
"highest_cpu_id": 3 "highest_cpu_id": 3
}
}, },
"syscalls": { {
"type": "syscalls",
"value": {
"svcSetHeapSize": "0x01", "svcSetHeapSize": "0x01",
"svcSetMemoryPermission": "0x02", "svcSetMemoryPermission": "0x02",
"svcSetMemoryAttribute": "0x03", "svcSetMemoryAttribute": "0x03",
@ -86,11 +93,18 @@
"svcQueryDebugProcessMemory": "0x69", "svcQueryDebugProcessMemory": "0x69",
"svcReadDebugProcessMemory": "0x6a", "svcReadDebugProcessMemory": "0x6a",
"svcGetDebugThreadParam": "0x6d" "svcGetDebugThreadParam": "0x6d"
}
}, },
"min_kernel_version": "0x0060", {
"debug_flags": { "type": "min_kernel_version",
"value": "0x0060"
},
{
"type": "debug_flags",
"value": {
"allow_debug": false, "allow_debug": false,
"force_debug": true "force_debug": true
} }
} }
]
} }

View file

@ -5,9 +5,14 @@
"main_thread_priority": 43, "main_thread_priority": 43,
"default_cpu_id": 3, "default_cpu_id": 3,
"process_category": 1, "process_category": 1,
"kernel_capabilities" : { "kernel_capabilities": [
"handle_table_size" : 512, {
"syscalls": { "type": "handle_table_size",
"value": 512
},
{
"type": "syscalls",
"value": {
"svcSetHeapSize": "0x01", "svcSetHeapSize": "0x01",
"svcSetMemoryPermission": "0x02", "svcSetMemoryPermission": "0x02",
"svcSetMemoryAttribute": "0x03", "svcSetMemoryAttribute": "0x03",
@ -68,4 +73,5 @@
"svcGetSystemInfo": "0x6f" "svcGetSystemInfo": "0x6f"
} }
} }
]
} }

View file

@ -5,9 +5,14 @@
"main_thread_priority": 49, "main_thread_priority": 49,
"default_cpu_id": 3, "default_cpu_id": 3,
"process_category": 1, "process_category": 1,
"kernel_capabilities" : { "kernel_capabilities": [
"handle_table_size" : 128, {
"syscalls" : { "type": "handle_table_size",
"value": 128
},
{
"type": "syscalls",
"value": {
"svcSetHeapSize" : "0x01", "svcSetHeapSize" : "0x01",
"svcSetMemoryPermission" : "0x02", "svcSetMemoryPermission" : "0x02",
"svcSetMemoryAttribute" : "0x03", "svcSetMemoryAttribute" : "0x03",
@ -67,4 +72,5 @@
"svcCreateProcess" : "0x79" "svcCreateProcess" : "0x79"
} }
} }
]
} }

View file

@ -5,9 +5,14 @@
"main_thread_priority": 49, "main_thread_priority": 49,
"default_cpu_id": 3, "default_cpu_id": 3,
"process_category": 1, "process_category": 1,
"kernel_capabilities": { "kernel_capabilities": [
"handle_table_size": 128, {
"syscalls": { "type": "handle_table_size",
"value": 128
},
{
"type": "syscalls",
"value": {
"svcSetHeapSize": "0x01", "svcSetHeapSize": "0x01",
"svcSetMemoryPermission": "0x02", "svcSetMemoryPermission": "0x02",
"svcSetMemoryAttribute": "0x03", "svcSetMemoryAttribute": "0x03",
@ -59,13 +64,14 @@
"svcReplyAndReceive": "0x43", "svcReplyAndReceive": "0x43",
"svcReplyAndReceiveWithUserBuffer": "0x44", "svcReplyAndReceiveWithUserBuffer": "0x44",
"svcCreateEvent": "0x45", "svcCreateEvent": "0x45",
"svcSetUnsafeLimit": "0x4a",
"svcStartProcess": "0x7a", "svcStartProcess": "0x7a",
"svcTerminateProcess": "0x7b", "svcTerminateProcess": "0x7b",
"svcGetProcessInfo": "0x7c", "svcGetProcessInfo": "0x7c",
"svcCreateResourceLimit": "0x7d", "svcCreateResourceLimit": "0x7d",
"svcSetResourceLimitLimitValue": "0x7e", "svcSetResourceLimitLimitValue": "0x7e",
"svcSetUnsafeLimit": "0x4a",
"svcGetSystemInfo": "0x6f" "svcGetSystemInfo": "0x6f"
} }
} }
]
} }

View file

@ -5,9 +5,14 @@
"main_thread_priority": 27, "main_thread_priority": 27,
"default_cpu_id": 3, "default_cpu_id": 3,
"process_category": 1, "process_category": 1,
"kernel_capabilities" : { "kernel_capabilities": [
"handle_table_size" : 512, {
"syscalls" : { "type": "handle_table_size",
"value": 512
},
{
"type": "syscalls",
"value": {
"svcSetHeapSize" : "0x01", "svcSetHeapSize" : "0x01",
"svcSetMemoryPermission" : "0x02", "svcSetMemoryPermission" : "0x02",
"svcSetMemoryAttribute" : "0x03", "svcSetMemoryAttribute" : "0x03",
@ -63,4 +68,5 @@
"svcConnectToPort" : "0x72" "svcConnectToPort" : "0x72"
} }
} }
]
} }