From a2b6994572dd680f3573ad705b2e39cbe4a4ba91 Mon Sep 17 00:00:00 2001 From: google0101-ryan Date: Mon, 8 Jan 2024 19:03:41 +0000 Subject: [PATCH] deploy: 502501b5afa9ab7c7c844420548e3f748e5a406e --- annotated.html | 29 +- classes.html | 23 +- d5/d16/xex_8cpp_source.html | 736 ++++++++++++++-------------- d8/d71/memory_8cpp_source.html | 453 +++++++++-------- d8/dc6/classXexLoader.html | 8 +- d9/d08/structAllocInfo-members.html | 89 ++++ dc/d18/memory_8h_source.html | 50 +- de/de7/structAllocInfo.html | 134 +++++ df/d0a/main_8cpp_source.html | 41 +- doxygen_crawl.html | 2 + hierarchy.html | 31 +- inherit_graph_0.map | 2 +- inherit_graph_0.md5 | 2 +- inherit_graph_0.png | Bin 2309 -> 1153 bytes inherit_graph_1.map | 2 +- inherit_graph_1.md5 | 2 +- inherit_graph_1.png | Bin 1734 -> 2309 bytes inherit_graph_10.map | 2 +- inherit_graph_10.md5 | 2 +- inherit_graph_10.png | Bin 1241 -> 2056 bytes inherit_graph_11.map | 2 +- inherit_graph_11.md5 | 2 +- inherit_graph_11.png | Bin 1427 -> 1241 bytes inherit_graph_12.map | 2 +- inherit_graph_12.md5 | 2 +- inherit_graph_12.png | Bin 1392 -> 1427 bytes inherit_graph_13.map | 2 +- inherit_graph_13.md5 | 2 +- inherit_graph_13.png | Bin 1539 -> 1392 bytes inherit_graph_14.map | 3 + inherit_graph_14.md5 | 1 + inherit_graph_14.png | Bin 0 -> 1539 bytes inherit_graph_2.map | 4 +- inherit_graph_2.md5 | 2 +- inherit_graph_2.png | Bin 2965 -> 1734 bytes inherit_graph_3.map | 4 +- inherit_graph_3.md5 | 2 +- inherit_graph_3.png | Bin 1775 -> 2965 bytes inherit_graph_4.map | 2 +- inherit_graph_4.md5 | 2 +- inherit_graph_4.png | Bin 1634 -> 1775 bytes inherit_graph_5.map | 2 +- inherit_graph_5.md5 | 2 +- inherit_graph_5.png | Bin 2454 -> 1634 bytes inherit_graph_6.map | 2 +- inherit_graph_6.md5 | 2 +- inherit_graph_6.png | Bin 2653 -> 2454 bytes inherit_graph_7.map | 2 +- inherit_graph_7.md5 | 2 +- inherit_graph_7.png | Bin 2481 -> 2653 bytes inherit_graph_8.map | 2 +- inherit_graph_8.md5 | 2 +- inherit_graph_8.png | Bin 1746 -> 2481 bytes inherit_graph_9.map | 2 +- inherit_graph_9.md5 | 2 +- inherit_graph_9.png | Bin 2056 -> 1746 bytes inherits.html | 33 +- search/all_0.js | 2 +- search/all_1.js | 2 +- search/all_2.js | 3 +- search/all_3.js | 3 +- search/all_4.js | 2 +- search/all_5.js | 2 +- search/all_6.js | 3 +- search/all_7.js | 3 +- search/all_8.js | 2 +- search/all_9.js | 2 +- search/all_a.js | 5 +- search/all_b.js | 7 + search/classes_0.js | 2 +- search/classes_1.js | 2 +- search/classes_2.js | 2 +- search/classes_3.js | 2 +- search/classes_4.js | 2 +- search/classes_5.js | 3 +- search/classes_6.js | 3 +- search/classes_7.js | 2 +- search/classes_8.js | 2 +- search/classes_9.js | 5 +- search/classes_a.js | 7 + search/searchdata.js | 4 +- 81 files changed, 1028 insertions(+), 737 deletions(-) create mode 100644 d9/d08/structAllocInfo-members.html create mode 100644 de/de7/structAllocInfo.html create mode 100644 inherit_graph_14.map create mode 100644 inherit_graph_14.md5 create mode 100644 inherit_graph_14.png create mode 100644 search/all_b.js create mode 100644 search/classes_a.js diff --git a/annotated.html b/annotated.html index 1d88544..73527f2 100644 --- a/annotated.html +++ b/annotated.html @@ -77,20 +77,21 @@
Here are the classes, structs, unions and interfaces with brief descriptions:
- - - - - - - - - - - - - - + + + + + + + + + + + + + + +
 CbasicCompression_t
 CfileFormatInfo_t
 CimportHeader_t
 ClibraryHeader_t
 CmspackMemoryFile_t
 CnormalCompressionBlock_t
 CnormalCompressionHeader_t
 CoptionalHeader_tFollowing the XEX header are xexHeader_t::optional_header_count optional headers, which either contain an offset to a struct, or a value
 CpageDescriptor_t
 Cuint128_t
 CxexExport_t
 CxexHeader_tThe header of a .xex file
 CxexLibrary_t
 CXexLoader
 CAllocInfo
 CbasicCompression_t
 CfileFormatInfo_t
 CimportHeader_t
 ClibraryHeader_t
 CmspackMemoryFile_t
 CnormalCompressionBlock_t
 CnormalCompressionHeader_t
 CoptionalHeader_tFollowing the XEX header are xexHeader_t::optional_header_count optional headers, which either contain an offset to a struct, or a value
 CpageDescriptor_t
 Cuint128_t
 CxexExport_t
 CxexHeader_tThe header of a .xex file
 CxexLibrary_t
 CXexLoader
diff --git a/classes.html b/classes.html index a03ba43..c9cf71b 100644 --- a/classes.html +++ b/classes.html @@ -75,36 +75,39 @@
Class Index
-
B | F | I | L | M | N | O | P | U | X
+
A | B | F | I | L | M | N | O | P | U | X
+
A
+
AllocInfo
+
B
basicCompression_t
-
+
F
fileFormatInfo_t
-
+
I
importHeader_t
-
+
L
libraryHeader_t
-
+
M
mspackMemoryFile_t
-
+
N
normalCompressionBlock_t
normalCompressionHeader_t
-
+
O
optionalHeader_t
-
+
P
pageDescriptor_t
-
+
U
uint128_t
-
+
X
xexExport_t
xexHeader_t
xexLibrary_t
XexLoader
diff --git a/d5/d16/xex_8cpp_source.html b/d5/d16/xex_8cpp_source.html index f45f7e7..e24a4a3 100644 --- a/d5/d16/xex_8cpp_source.html +++ b/d5/d16/xex_8cpp_source.html @@ -166,385 +166,389 @@
79 optHeaders.push_back(opt);
80 }
81
-
82 mainXexSize = image_size();
-
83
-
84 // Parse security info, including AES key decryption
-
85 uint8_t* aes_key = (buffer+header.sec_info_offset+336);
-
86 aes_decrypt_buffer(xe_xex2_retail_key, aes_key, 16, session_key, 16);
-
87
-
88 printf("AES key is 0x%02x", session_key[0]);
-
89 for (int i = 0; i < 15; i++)
-
90 {
-
91 printf("%02x", session_key[i+1]);
-
92 }
-
93 printf("\n");
-
94
-
95 for (auto& hdr : optHeaders)
-
96 {
-
97 switch (hdr.id)
-
98 {
-
99 case 0x2ff:
-
100 break;
-
101 case 0x3ff:
-
102 {
-
103 fileInfoOffset = hdr.offset;
-
104 ParseFileInfo(hdr.offset);
-
105 break;
-
106 }
-
107 case 0x10100:
-
108 entryPoint = hdr.value;
-
109 printf("Image entry point is 0x%08x\n", entryPoint);
-
110 break;
-
111 case 0x10201:
-
112 baseAddress = hdr.value;
-
113 mainXexBase = baseAddress;
-
114 printf("Image base is 0x%08x\n", baseAddress);
-
115 break;
-
116 case 0x103FF:
-
117 importBaseAddr = hdr.offset;
-
118 break;
-
119 case 0x20200:
-
120 stackSize = hdr.value;
-
121 printf("Stack size is 0x%08x\n", hdr.value);
-
122 break;
-
123 default:
-
124 printf("Unknown optional header ID: 0x%08x\n", hdr.id);
-
125 }
-
126 }
-
127
-
128 // Decrypt/decompress the file
-
129 printf("%d, %d\n", encryptionFormat, compressionFormat);
-
130 char* outBuffer;
-
131 uint32_t uncompressedSize;
-
132 switch (compressionFormat)
-
133 {
-
134 case 1:
-
135 uncompressedSize = ReadImageBasicCompressed(buffer, len, &outBuffer);
-
136 break;
-
137 case 2:
-
138 uncompressedSize = ReadImageCompressed(buffer, len, &outBuffer);
-
139 break;
-
140 default:
-
141 printf("Unknown compression format %d\n", compressionFormat);
-
142 exit(1);
-
143 }
-
144
-
145 std::ofstream out("out.pe");
-
146 out.write(outBuffer, uncompressedSize);
-
147 out.close();
-
148
-
149 // We've got the PE header inside outBuffer now
-
150 if (*(uint32_t*)outBuffer != 0x00905a4d /*"PE" followed by 0x9000*/)
-
151 {
-
152 printf("Invalid PE magic\n");
-
153 exit(1);
-
154 }
-
155
-
156 printf("Found valid PE header file\n");
-
157
-
158 void* base = Memory::AllocMemory(baseAddress, uncompressedSize);
-
159 memcpy(base, outBuffer, uncompressedSize);
-
160
-
161 // Load exports
-
162 exportBaseAddr = bswap32(*(uint32_t*)&buffer[header.sec_info_offset+0x160]);
-
163 exportTable.magic[0] = Memory::Read32(exportBaseAddr+0x00);
-
164 exportTable.magic[1] = Memory::Read32(exportBaseAddr+0x04);
-
165 exportTable.magic[2] = Memory::Read32(exportBaseAddr+0x08);
-
166 exportTable.modulenumber[0] = Memory::Read32(exportBaseAddr+0x0C);
-
167 exportTable.modulenumber[1] = Memory::Read32(exportBaseAddr+0x10);
-
168 exportTable.version[0] = Memory::Read32(exportBaseAddr+0x14);
-
169 exportTable.version[1] = Memory::Read32(exportBaseAddr+0x18);
-
170 exportTable.version[2] = Memory::Read32(exportBaseAddr+0x1C);
-
171 exportTable.imagebaseaddr = Memory::Read32(exportBaseAddr+0x20);
-
172 exportTable.count = Memory::Read32(exportBaseAddr+0x24);
-
173 exportTable.base = Memory::Read32(exportBaseAddr+0x28);
-
174
-
175 // Now we can patch module calls
-
176 // xam.xex and xboxkrnl.exe are the two most common imports afaict
-
177 importHeader_t importHdr = *(importHeader_t*)&buffer[importBaseAddr];
-
178 importHdr.size = bswap32(importHdr.size);
-
179 importHdr.stringTable.count = bswap32(importHdr.stringTable.count);
-
180 importHdr.stringTable.size = bswap32(importHdr.stringTable.size);
-
181
-
182 std::vector<std::string> importNames;
-
183 for (size_t i = 0, j = 0; i < importHdr.stringTable.size && j < importHdr.stringTable.count; j++)
-
184 {
-
185 const char* string = (const char*)&buffer[importBaseAddr+sizeof(importHeader_t)+i];
-
186 importNames.push_back(std::string(string));
-
187
-
188 i += strlen(string) + 1;
-
189 if ((i % 4) != 0)
-
190 i += 4 - (i % 4);
-
191
-
192 printf("Found import \"%s\"\n", string);
-
193 }
-
194
-
195 uint32_t libraryoffs = importHdr.stringTable.size + 12;
-
196 while (libraryoffs < importHdr.size)
-
197 {
-
198 libraryHeader_t libHdr = *(libraryHeader_t*)&buffer[importBaseAddr + libraryoffs];
-
199
-
200 libHdr.count = bswap16(libHdr.count);
-
201 libHdr.id = bswap32(libHdr.id);
-
202 libHdr.name_index = bswap16(libHdr.name_index);
-
203 libHdr.size = bswap32(libHdr.size);
-
204 libHdr.version_min_value = bswap32(libHdr.version_min_value);
-
205 libHdr.version_value = bswap32(libHdr.version_value);
-
206
-
207 xexLibrary_t lib;
-
208 lib.header = libHdr;
-
209 lib.name = importNames[libHdr.name_index];
-
210
-
211 printf("Parsing imports for \"%s\"\n", lib.name.c_str());
-
212
-
213 ParseLibraryInfo(importBaseAddr+libraryoffs+sizeof(libraryHeader_t), lib, libraries.size(), lib.name);
+
82 if (!mainXexSize)
+
83 mainXexSize = image_size();
+
84
+
85 // Parse security info, including AES key decryption
+
86 uint8_t* aes_key = (buffer+header.sec_info_offset+336);
+
87 aes_decrypt_buffer(xe_xex2_retail_key, aes_key, 16, session_key, 16);
+
88
+
89 printf("AES key is 0x%02x", session_key[0]);
+
90 for (int i = 0; i < 15; i++)
+
91 {
+
92 printf("%02x", session_key[i+1]);
+
93 }
+
94 printf("\n");
+
95
+
96 for (auto& hdr : optHeaders)
+
97 {
+
98 switch (hdr.id)
+
99 {
+
100 case 0x2ff:
+
101 break;
+
102 case 0x3ff:
+
103 {
+
104 fileInfoOffset = hdr.offset;
+
105 ParseFileInfo(hdr.offset);
+
106 break;
+
107 }
+
108 case 0x10100:
+
109 entryPoint = hdr.value;
+
110 printf("Image entry point is 0x%08x\n", entryPoint);
+
111 break;
+
112 case 0x10201:
+
113 baseAddress = hdr.value;
+
114 if (!mainXexBase)
+
115 mainXexBase = baseAddress;
+
116 printf("Image base is 0x%08x\n", baseAddress);
+
117 break;
+
118 case 0x103FF:
+
119 importBaseAddr = hdr.offset;
+
120 break;
+
121 case 0x20200:
+
122 stackSize = hdr.value;
+
123 printf("Stack size is 0x%08x\n", hdr.value);
+
124 break;
+
125 default:
+
126 printf("Unknown optional header ID: 0x%08x\n", hdr.id);
+
127 }
+
128 }
+
129
+
130 // Decrypt/decompress the file
+
131 printf("%d, %d\n", encryptionFormat, compressionFormat);
+
132 char* outBuffer;
+
133 uint32_t uncompressedSize;
+
134 switch (compressionFormat)
+
135 {
+
136 case 1:
+
137 uncompressedSize = ReadImageBasicCompressed(buffer, len, &outBuffer);
+
138 break;
+
139 case 2:
+
140 uncompressedSize = ReadImageCompressed(buffer, len, &outBuffer);
+
141 break;
+
142 default:
+
143 printf("Unknown compression format %d\n", compressionFormat);
+
144 exit(1);
+
145 }
+
146
+
147 std::ofstream out("out.pe");
+
148 out.write(outBuffer, uncompressedSize);
+
149 out.close();
+
150
+
151 // We've got the PE header inside outBuffer now
+
152 if (*(uint32_t*)outBuffer != 0x00905a4d /*"PE" followed by 0x9000*/)
+
153 {
+
154 printf("Invalid PE magic\n");
+
155 }
+
156 else
+
157 printf("Found valid PE header file\n");
+
158
+
159 void* base = Memory::AllocMemory(baseAddress, uncompressedSize);
+
160 memcpy(base, outBuffer, uncompressedSize);
+
161
+
162 // Load exports
+
163 exportBaseAddr = bswap32(*(uint32_t*)&buffer[header.sec_info_offset+0x160]);
+
164 if (exportBaseAddr)
+
165 {
+
166 exportTable.magic[0] = Memory::Read32(exportBaseAddr+0x00);
+
167 exportTable.magic[1] = Memory::Read32(exportBaseAddr+0x04);
+
168 exportTable.magic[2] = Memory::Read32(exportBaseAddr+0x08);
+
169 exportTable.modulenumber[0] = Memory::Read32(exportBaseAddr+0x0C);
+
170 exportTable.modulenumber[1] = Memory::Read32(exportBaseAddr+0x10);
+
171 exportTable.version[0] = Memory::Read32(exportBaseAddr+0x14);
+
172 exportTable.version[1] = Memory::Read32(exportBaseAddr+0x18);
+
173 exportTable.version[2] = Memory::Read32(exportBaseAddr+0x1C);
+
174 exportTable.imagebaseaddr = Memory::Read32(exportBaseAddr+0x20);
+
175 exportTable.count = Memory::Read32(exportBaseAddr+0x24);
+
176 exportTable.base = Memory::Read32(exportBaseAddr+0x28);
+
177 }
+
178
+
179 // Now we can patch module calls
+
180 // xam.xex and xboxkrnl.exe are the two most common imports afaict
+
181 importHeader_t importHdr = *(importHeader_t*)&buffer[importBaseAddr];
+
182 importHdr.size = bswap32(importHdr.size);
+
183 importHdr.stringTable.count = bswap32(importHdr.stringTable.count);
+
184 importHdr.stringTable.size = bswap32(importHdr.stringTable.size);
+
185
+
186 std::vector<std::string> importNames;
+
187 for (size_t i = 0, j = 0; i < importHdr.stringTable.size && j < importHdr.stringTable.count; j++)
+
188 {
+
189 const char* string = (const char*)&buffer[importBaseAddr+sizeof(importHeader_t)+i];
+
190 importNames.push_back(std::string(string));
+
191
+
192 i += strlen(string) + 1;
+
193 if ((i % 4) != 0)
+
194 i += 4 - (i % 4);
+
195
+
196 printf("Found import \"%s\"\n", string);
+
197 }
+
198
+
199 uint32_t libraryoffs = importHdr.stringTable.size + 12;
+
200 while (libraryoffs < importHdr.size)
+
201 {
+
202 libraryHeader_t libHdr = *(libraryHeader_t*)&buffer[importBaseAddr + libraryoffs];
+
203
+
204 libHdr.count = bswap16(libHdr.count);
+
205 libHdr.id = bswap32(libHdr.id);
+
206 libHdr.name_index = bswap16(libHdr.name_index);
+
207 libHdr.size = bswap32(libHdr.size);
+
208 libHdr.version_min_value = bswap32(libHdr.version_min_value);
+
209 libHdr.version_value = bswap32(libHdr.version_value);
+
210
+
211 xexLibrary_t lib;
+
212 lib.header = libHdr;
+
213 lib.name = importNames[libHdr.name_index];
214
-
215 libraries.push_back(lib);
-
216
-
217 libraryoffs += libHdr.size;
-
218 }
-
219
-
220 Kernel::RegisterModuleForName(GetName().c_str(), this);
-
221}
+
215 printf("Parsing imports for \"%s\"\n", lib.name.c_str());
+
216
+
217 ParseLibraryInfo(importBaseAddr+libraryoffs+sizeof(libraryHeader_t), lib, libraries.size(), lib.name);
+
218
+
219 libraries.push_back(lib);
+
220
+
221 libraryoffs += libHdr.size;
+
222 }
+
223
+
224 Kernel::RegisterModuleForName(GetName().c_str(), this);
+
225}
-
222
-
223uint32_t XexLoader::GetEntryPoint() const
-
224{
-
225 return entryPoint;
-
226}
-
227
-
228uint32_t XexLoader::GetStackSize() const
-
229{
-
230 return stackSize;
-
231}
-
232
-
233size_t XexLoader::GetLibraryIndexByName(const char *name) const
-
234{
-
235 for (int i = 0; i < libraries.size(); i++)
-
236 {
-
237 auto& lib = libraries[i];
-
238 if (lib.name == name)
-
239 return i;
-
240 }
-
241 return SIZE_MAX;
-
242}
-
243
-
244uint32_t XexLoader::LookupOrdinal(uint32_t ordinal)
-
245{
-
246 ordinal -= exportTable.base;
-
247 if (ordinal >= exportTable.count)
-
248 {
-
249 printf("ERROR: Imported unknown function 0x%08x\n", ordinal);
-
250 exit(1);
-
251 }
-
252
-
253 uint32_t num = ordinal;
-
254 uint32_t ordinal_offset = Memory::Read32(exportBaseAddr+sizeof(xexExport_t)+(num*4));
-
255 ordinal_offset += exportTable.imagebaseaddr << 16;
-
256 return ordinal_offset;
-
257}
-
258
-
259void XexLoader::ParseFileInfo(uint32_t offset)
-
260{
-
261 fileFormatInfo_t fileInfo = *(fileFormatInfo_t*)&buffer[offset];
-
262 fileInfo.info_size = bswap32(fileInfo.info_size);
-
263 fileInfo.compression_type = bswap16(fileInfo.compression_type);
-
264 fileInfo.encryption_type = bswap16(fileInfo.encryption_type);
-
265
-
266 printf("Found file info optional header: %d bytes, compression of type %d, encryption of type %d\n", fileInfo.info_size, fileInfo.compression_type, fileInfo.encryption_type);
-
267
-
268 compressionFormat = fileInfo.compression_type;
-
269 encryptionFormat = fileInfo.encryption_type;
-
270 info = fileInfo;
-
271}
-
272
-
273void XexLoader::ParseLibraryInfo(uint32_t offset, xexLibrary_t &lib, int index, std::string& name)
-
274{
-
275 for (uint32_t i = 0; i < lib.header.count; i++)
-
276 {
-
277 uint32_t recordAddr = bswap32(*(uint32_t*)&buffer[offset]);
-
278 offset += 4;
-
279
-
280 uint32_t record = Memory::Read32(recordAddr);
-
281
-
282 // Write the following routine to RAM:
-
283 // li r11, mod_func_id
-
284 // sc 2
-
285 // blr
-
286 // nop
-
287 if ((record >> 24) == 1 && name != "xam.xex")
-
288 {
-
289 Memory::Write32(recordAddr+0x00, 0x39600000 | (index << 12) | (record & 0xFFFF));
-
290 Memory::Write32(recordAddr+0x04, 0x44000042);
-
291 Memory::Write32(recordAddr+0x08, 0x4e800020);
-
292 Memory::Write32(recordAddr+0x0C, 0x60000000);
-
293 }
-
294 else if ((record >> 24) == 1 && name == "xam.xex")
-
295 {
-
296 // We instead write a stub to call xam.xex functions since we LLE it
-
297 assert(this != xam); // Should never happen, but just in case
-
298
-
299 // Get exports from xam.xex
-
300 uint32_t addr = xam->LookupOrdinal(record & 0xFFFF);
-
301 Memory::Write32(recordAddr+0x00, 0x3D600000 | addr >> 16);
-
302 Memory::Write32(recordAddr+0x04, 0x616B0000 | (addr & 0xFFFF));
-
303 Memory::Write32(recordAddr+0x08, 0x7D6903A6);
-
304 Memory::Write32(recordAddr+0x0C, 0x4E800420);
-
305 }
-
306 }
-
307}
-
308
-
309int XexLoader::ReadImageBasicCompressed(uint8_t *buffer, size_t xex_len, char** outBuffer)
-
310{
-
311 const uint8_t* p = buffer+header.header_size;
-
312 std::vector<basicCompression_t> blocks((info.info_size - 8) / 8);
-
313 uint32_t uncompressedSize = 0;
-
314 for (size_t i = 0; i < (info.info_size - 8) / 8; i++)
-
315 {
-
316 uint32_t offset = fileInfoOffset + 8 + (i * 8);
-
317 basicCompression_t comp = *(basicCompression_t*)&buffer[offset];
-
318 comp.data_size = bswap32(comp.data_size);
-
319 comp.zero_size = bswap32(comp.zero_size);
-
320 blocks.push_back(comp);
-
321 uncompressedSize += comp.data_size + comp.zero_size;
-
322 }
-
323
-
324 printf("Image is %d bytes uncompressed\n", uncompressedSize);
-
325
-
326 char* out = new char[uncompressedSize];
-
327 *outBuffer = out;
-
328 uint8_t* d = (uint8_t*)out;
+
226
+
227uint32_t XexLoader::GetEntryPoint() const
+
228{
+
229 return entryPoint;
+
230}
+
231
+
232uint32_t XexLoader::GetStackSize() const
+
233{
+
234 return stackSize;
+
235}
+
236
+
237size_t XexLoader::GetLibraryIndexByName(const char *name) const
+
238{
+
239 for (int i = 0; i < libraries.size(); i++)
+
240 {
+
241 auto& lib = libraries[i];
+
242 if (lib.name == name)
+
243 return i;
+
244 }
+
245 return SIZE_MAX;
+
246}
+
247
+
248uint32_t XexLoader::LookupOrdinal(uint32_t ordinal)
+
249{
+
250 ordinal -= exportTable.base;
+
251 if (ordinal >= exportTable.count)
+
252 {
+
253 printf("ERROR: Imported unknown function 0x%08x\n", ordinal);
+
254 exit(1);
+
255 }
+
256
+
257 uint32_t num = ordinal;
+
258 uint32_t ordinal_offset = Memory::Read32(exportBaseAddr+sizeof(xexExport_t)+(num*4));
+
259 ordinal_offset += exportTable.imagebaseaddr << 16;
+
260 return ordinal_offset;
+
261}
+
262
+
263void XexLoader::ParseFileInfo(uint32_t offset)
+
264{
+
265 fileFormatInfo_t fileInfo = *(fileFormatInfo_t*)&buffer[offset];
+
266 fileInfo.info_size = bswap32(fileInfo.info_size);
+
267 fileInfo.compression_type = bswap16(fileInfo.compression_type);
+
268 fileInfo.encryption_type = bswap16(fileInfo.encryption_type);
+
269
+
270 printf("Found file info optional header: %d bytes, compression of type %d, encryption of type %d\n", fileInfo.info_size, fileInfo.compression_type, fileInfo.encryption_type);
+
271
+
272 compressionFormat = fileInfo.compression_type;
+
273 encryptionFormat = fileInfo.encryption_type;
+
274 info = fileInfo;
+
275}
+
276
+
277void XexLoader::ParseLibraryInfo(uint32_t offset, xexLibrary_t &lib, int index, std::string& name)
+
278{
+
279 for (uint32_t i = 0; i < lib.header.count; i++)
+
280 {
+
281 uint32_t recordAddr = bswap32(*(uint32_t*)&buffer[offset]);
+
282 offset += 4;
+
283
+
284 uint32_t record = Memory::Read32(recordAddr);
+
285
+
286 // Write the following routine to RAM:
+
287 // li r11, mod_func_id
+
288 // sc 2
+
289 // blr
+
290 // nop
+
291 if ((record >> 24) == 1 && name != "xam.xex")
+
292 {
+
293 Memory::Write32(recordAddr+0x00, 0x39600000 | (index << 12) | (record & 0xFFFF));
+
294 Memory::Write32(recordAddr+0x04, 0x44000042);
+
295 Memory::Write32(recordAddr+0x08, 0x4e800020);
+
296 Memory::Write32(recordAddr+0x0C, 0x60000000);
+
297 }
+
298 else if ((record >> 24) == 1 && name == "xam.xex")
+
299 {
+
300 // We instead write a stub to call xam.xex functions since we LLE it
+
301 assert(this != xam); // Should never happen, but just in case
+
302
+
303 // Get exports from xam.xex
+
304 uint32_t addr = xam->LookupOrdinal(record & 0xFFFF);
+
305 Memory::Write32(recordAddr+0x00, 0x3D600000 | addr >> 16);
+
306 Memory::Write32(recordAddr+0x04, 0x616B0000 | (addr & 0xFFFF));
+
307 Memory::Write32(recordAddr+0x08, 0x7D6903A6);
+
308 Memory::Write32(recordAddr+0x0C, 0x4E800420);
+
309 }
+
310 }
+
311}
+
312
+
313int XexLoader::ReadImageBasicCompressed(uint8_t *buffer, size_t xex_len, char** outBuffer)
+
314{
+
315 const uint8_t* p = buffer+header.header_size;
+
316 std::vector<basicCompression_t> blocks((info.info_size - 8) / 8);
+
317 uint32_t uncompressedSize = 0;
+
318 for (size_t i = 0; i < (info.info_size - 8) / 8; i++)
+
319 {
+
320 uint32_t offset = fileInfoOffset + 8 + (i * 8);
+
321 basicCompression_t comp = *(basicCompression_t*)&buffer[offset];
+
322 comp.data_size = bswap32(comp.data_size);
+
323 comp.zero_size = bswap32(comp.zero_size);
+
324 blocks.push_back(comp);
+
325 uncompressedSize += comp.data_size + comp.zero_size;
+
326 }
+
327
+
328 printf("Image is %d bytes uncompressed\n", uncompressedSize);
329
-
330 uint32_t rk[4 * (MAXNR + 1)];
-
331 uint8_t ivec[16] = {0};
-
332 int32_t Nr = rijndaelKeySetupDec(rk, session_key, 128);
+
330 char* out = new char[uncompressedSize];
+
331 *outBuffer = out;
+
332 uint8_t* d = (uint8_t*)out;
333
-
334 for (size_t n = 0; n < blocks.size(); n++)
-
335 {
-
336 const uint32_t dataSize = blocks[n].data_size;
-
337 const uint32_t zeroSize = blocks[n].zero_size;
-
338
-
339 const uint8_t* ct = p;
-
340 uint8_t* pt = d;
-
341 for (size_t m = 0; m < dataSize; m += 16, ct += 16, pt += 16)
-
342 {
-
343 rijndaelDecrypt(rk, Nr, ct, pt);
-
344 for (size_t i = 0; i < 16; i++)
-
345 {
-
346 pt[i] ^= ivec[i];
-
347 ivec[i] = ct[i];
-
348 }
-
349 }
-
350
-
351 p += dataSize;
-
352 d += dataSize + zeroSize;
-
353 }
+
334 uint32_t rk[4 * (MAXNR + 1)];
+
335 uint8_t ivec[16] = {0};
+
336 int32_t Nr = rijndaelKeySetupDec(rk, session_key, 128);
+
337
+
338 for (size_t n = 0; n < blocks.size(); n++)
+
339 {
+
340 const uint32_t dataSize = blocks[n].data_size;
+
341 const uint32_t zeroSize = blocks[n].zero_size;
+
342
+
343 const uint8_t* ct = p;
+
344 uint8_t* pt = d;
+
345 for (size_t m = 0; m < dataSize; m += 16, ct += 16, pt += 16)
+
346 {
+
347 rijndaelDecrypt(rk, Nr, ct, pt);
+
348 for (size_t i = 0; i < 16; i++)
+
349 {
+
350 pt[i] ^= ivec[i];
+
351 ivec[i] = ct[i];
+
352 }
+
353 }
354
-
355 return uncompressedSize;
-
356}
-
357
-
358int XexLoader::ReadImageCompressed(uint8_t *buffer, size_t xex_len, char **outBuffer)
-
359{
-
360 const uint32_t exe_length = (uint32_t)(xex_len - header.header_size);
-
361 const uint8_t* exe_buffer = (const uint8_t*)(buffer + header.header_size);
-
362
-
363 uint8_t* compress_buffer = NULL;
-
364 const uint8_t* p = NULL;
-
365 uint8_t* d = NULL;
+
355 p += dataSize;
+
356 d += dataSize + zeroSize;
+
357 }
+
358
+
359 return uncompressedSize;
+
360}
+
361
+
362int XexLoader::ReadImageCompressed(uint8_t *buffer, size_t xex_len, char **outBuffer)
+
363{
+
364 const uint32_t exe_length = (uint32_t)(xex_len - header.header_size);
+
365 const uint8_t* exe_buffer = (const uint8_t*)(buffer + header.header_size);
366
-
367 bool free_input = false;
-
368 const uint8_t* input_buffer = exe_buffer;
-
369 size_t input_size = exe_length;
+
367 uint8_t* compress_buffer = NULL;
+
368 const uint8_t* p = NULL;
+
369 uint8_t* d = NULL;
370
-
371 switch (encryptionFormat)
-
372 {
-
373 case 0:
-
374 break;
-
375 case 1:
-
376 free_input = true;
-
377 input_buffer = (const uint8_t*)calloc(1, exe_length);
-
378 aes_decrypt_buffer(session_key, exe_buffer, exe_length, (uint8_t*)input_buffer, exe_length);
-
379 break;
-
380 }
-
381
-
382 normalCompressionHeader_t hdr = *(normalCompressionHeader_t*)(buffer + fileInfoOffset + sizeof(fileFormatInfo_t));
-
383 hdr.windowSize = bswap32(hdr.windowSize);
-
384 hdr.firstBlock.blockSize = bswap32(hdr.firstBlock.blockSize);
+
371 bool free_input = false;
+
372 const uint8_t* input_buffer = exe_buffer;
+
373 size_t input_size = exe_length;
+
374
+
375 switch (encryptionFormat)
+
376 {
+
377 case 0:
+
378 break;
+
379 case 1:
+
380 free_input = true;
+
381 input_buffer = (const uint8_t*)calloc(1, exe_length);
+
382 aes_decrypt_buffer(session_key, exe_buffer, exe_length, (uint8_t*)input_buffer, exe_length);
+
383 break;
+
384 }
385
-
386 normalCompressionBlock_t curBlock = hdr.firstBlock;
-
387
-
388 compress_buffer = (uint8_t*)calloc(1, exe_length);
+
386 normalCompressionHeader_t hdr = *(normalCompressionHeader_t*)(buffer + fileInfoOffset + sizeof(fileFormatInfo_t));
+
387 hdr.windowSize = bswap32(hdr.windowSize);
+
388 hdr.firstBlock.blockSize = bswap32(hdr.firstBlock.blockSize);
389
-
390 p = input_buffer;
-
391 d = compress_buffer;
-
392
-
393 int result_code = 0;
-
394
-
395 uint32_t blockOffs = sizeof(normalCompressionBlock_t);
-
396 while (curBlock.blockSize)
-
397 {
-
398 const uint8_t* pnext = p + curBlock.blockSize;
-
399 normalCompressionBlock_t next_block = *(normalCompressionBlock_t*)p;
-
400 blockOffs += sizeof(normalCompressionBlock_t);
-
401
-
402 next_block.blockSize = bswap32(next_block.blockSize);
-
403
-
404 p += 4;
-
405 p += 20;
-
406
-
407 while (true)
-
408 {
-
409 const size_t chunk_size = (p[0] << 8) | p[1];
-
410 p += 2;
-
411 if (!chunk_size)
-
412 break;
-
413
-
414 memcpy(d, p, chunk_size);
-
415 p += chunk_size;
-
416 d += chunk_size;
-
417 }
-
418
-
419 p = pnext;
-
420 curBlock = next_block;
-
421 }
+
390 normalCompressionBlock_t curBlock = hdr.firstBlock;
+
391
+
392 compress_buffer = (uint8_t*)calloc(1, exe_length);
+
393
+
394 p = input_buffer;
+
395 d = compress_buffer;
+
396
+
397 int result_code = 0;
+
398
+
399 uint32_t blockOffs = sizeof(normalCompressionBlock_t);
+
400 while (curBlock.blockSize)
+
401 {
+
402 const uint8_t* pnext = p + curBlock.blockSize;
+
403 normalCompressionBlock_t next_block = *(normalCompressionBlock_t*)p;
+
404 blockOffs += sizeof(normalCompressionBlock_t);
+
405
+
406 next_block.blockSize = bswap32(next_block.blockSize);
+
407
+
408 p += 4;
+
409 p += 20;
+
410
+
411 while (true)
+
412 {
+
413 const size_t chunk_size = (p[0] << 8) | p[1];
+
414 p += 2;
+
415 if (!chunk_size)
+
416 break;
+
417
+
418 memcpy(d, p, chunk_size);
+
419 p += chunk_size;
+
420 d += chunk_size;
+
421 }
422
-
423 uint32_t uncompressed_size = image_size();
-
424 char* out = new char[uncompressed_size];
-
425
-
426 (*outBuffer) = out;
-
427
-
428 if (!result_code)
-
429 {
-
430 std::memset(out, 0, uncompressed_size);
+
423 p = pnext;
+
424 curBlock = next_block;
+
425 }
+
426
+
427 uint32_t uncompressed_size = image_size();
+
428 char* out = new char[uncompressed_size];
+
429
+
430 (*outBuffer) = out;
431
-
432 result_code = lzx_decompress(compress_buffer, d - compress_buffer, out, uncompressed_size,
-
433 hdr.windowSize, nullptr, 0);
-
434 }
+
432 if (!result_code)
+
433 {
+
434 std::memset(out, 0, uncompressed_size);
435
-
436 if (compress_buffer)
-
437 free((void*)compress_buffer);
-
438 if (free_input)
-
439 free((void*)input_buffer);
-
440 return uncompressed_size;
-
441}
-
442
-
443uint32_t XexLoader::image_size()
-
444{
-
445 uint32_t pageDescriptorCount = bswap32(*(uint32_t*)&buffer[header.sec_info_offset + 0x180]);
+
436 result_code = lzx_decompress(compress_buffer, d - compress_buffer, out, uncompressed_size,
+
437 hdr.windowSize, nullptr, 0);
+
438 }
+
439
+
440 if (compress_buffer)
+
441 free((void*)compress_buffer);
+
442 if (free_input)
+
443 free((void*)input_buffer);
+
444 return uncompressed_size;
+
445}
446
-
447 uint32_t totalSize = 0;
-
448
-
449 for (int i = 0; i < pageDescriptorCount; i++)
-
450 {
-
451 uint32_t offs = header.sec_info_offset + 0x184 + (i * 0x18);
-
452 pageDescriptor_t page = *(pageDescriptor_t*)&buffer[offs];
-
453 page.value = bswap32(page.value);
-
454
-
455 totalSize += page.value * 4096;
-
456 }
-
457
-
458 return totalSize;
-
459}
+
447uint32_t XexLoader::image_size()
+
448{
+
449 uint32_t pageDescriptorCount = bswap32(*(uint32_t*)&buffer[header.sec_info_offset + 0x180]);
+
450
+
451 uint32_t totalSize = 0;
+
452
+
453 for (int i = 0; i < pageDescriptorCount; i++)
+
454 {
+
455 uint32_t offs = header.sec_info_offset + 0x184 + (i * 0x18);
+
456 pageDescriptor_t page = *(pageDescriptor_t*)&buffer[offs];
+
457 page.value = bswap32(page.value);
+
458
+
459 totalSize += page.value * 4096;
+
460 }
+
461
+
462 return totalSize;
+
463}
XexLoader
Definition xex.h:111
XexLoader::XexLoader
XexLoader(uint8_t *buffer, size_t len, std::string path)
Loads a .xex file from a buffer into memory.
Definition xex.cpp:46
basicCompression_t
Definition xex.h:39
diff --git a/d8/d71/memory_8cpp_source.html b/d8/d71/memory_8cpp_source.html index 5e7a6c4..4a49de3 100644 --- a/d8/d71/memory_8cpp_source.html +++ b/d8/d71/memory_8cpp_source.html @@ -100,230 +100,255 @@
14
15extern uint32_t mainThreadStackSize;
16
-
17uint8_t** readPages, **writePages;
-
18#define PAGE_SIZE (4*1024)
-
19#define MAX_ADDRESS_SPACE 0xFFFF0000
-
20std::bitset<MAX_ADDRESS_SPACE / PAGE_SIZE> usedPages;
-
21
-
22void Memory::Initialize()
-
23{
-
24 readPages = new uint8_t*[MAX_ADDRESS_SPACE / PAGE_SIZE];
-
25 writePages = new uint8_t*[MAX_ADDRESS_SPACE / PAGE_SIZE];
-
26 usedPages.reset();
-
27}
-
28
-
29void Memory::Dump()
-
30{
-
31 std::ofstream file("mem.dump");
-
32 for (uint32_t i = mainXexBase; i < mainXexBase+mainXexSize; i += 4)
-
33 {
-
34 uint32_t data = bswap32(Read32(i));
-
35 file.write((char*)&data, 4);
-
36 }
-
37 file.close();
-
38
-
39 file.open("stack.dump");
-
40 for (uint32_t i = 0x70000000; i < 0x70000000+mainThreadStackSize; i += 4)
-
41 {
-
42 uint32_t data = bswap32(Read32(i));
-
43 file.write((char*)&data, 4);
-
44 }
-
45 file.close();
-
46}
-
47
-
48void *Memory::AllocMemory(uint32_t baseAddress, uint32_t size)
-
49{
-
50 void* ret = mmap((void*)baseAddress, size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-
51
-
52 if (ret == MAP_FAILED)
-
53 {
-
54 printf("Failed to allocate memory: %s\n", strerror(errno));
-
55 exit(1);
-
56 }
-
57
-
58 size = (size + PAGE_SIZE) & ~PAGE_SIZE;
+
17std::vector<AllocInfo> allocInfo;
+
18
+
19uint8_t** readPages, **writePages;
+
20#define PAGE_SIZE (4*1024)
+
21#define MAX_ADDRESS_SPACE 0xFFFF0000
+
22std::bitset<MAX_ADDRESS_SPACE / PAGE_SIZE> usedPages;
+
23
+
24void Memory::Initialize()
+
25{
+
26 readPages = new uint8_t*[MAX_ADDRESS_SPACE / PAGE_SIZE];
+
27 writePages = new uint8_t*[MAX_ADDRESS_SPACE / PAGE_SIZE];
+
28 usedPages.reset();
+
29}
+
30
+
31void Memory::Dump()
+
32{
+
33 std::ofstream file("mem.dump");
+
34 for (uint32_t i = mainXexBase; i < mainXexBase+mainXexSize; i += 4)
+
35 {
+
36 uint32_t data = bswap32(Read32(i));
+
37 file.write((char*)&data, 4);
+
38 }
+
39 file.close();
+
40
+
41 file.open("stack.dump");
+
42 for (uint32_t i = 0x70000000; i < 0x70000000+mainThreadStackSize; i += 4)
+
43 {
+
44 uint32_t data = bswap32(Read32(i));
+
45 file.write((char*)&data, 4);
+
46 }
+
47 file.close();
+
48}
+
49
+
50void *Memory::AllocMemory(uint32_t baseAddress, uint32_t size)
+
51{
+
52 void* ret = mmap((void*)baseAddress, size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+
53
+
54 if (ret == MAP_FAILED)
+
55 {
+
56 printf("Failed to allocate memory: %s\n", strerror(errno));
+
57 exit(1);
+
58 }
59
-
60 for (int i = 0; i < size; i += PAGE_SIZE)
-
61 {
-
62 readPages[(baseAddress + i) / PAGE_SIZE] = ((uint8_t*)ret+i);
-
63 writePages[(baseAddress + i) / PAGE_SIZE] = ((uint8_t*)ret+i);
-
64 }
-
65
-
66 return ret;
-
67}
-
68
-
69uint32_t Memory::VirtAllocMemoryRange(uint32_t beginAddr, uint32_t endAddr, uint32_t size)
-
70{
-
71 uint32_t requiredPages = size / PAGE_SIZE;
-
72
-
73 // Find the lowest free range that fits the size
-
74 uint32_t candidate = 0;
-
75 uint32_t freePages = 0;
-
76 for (uint32_t i = beginAddr; i < endAddr; i += PAGE_SIZE)
-
77 {
-
78 if (!candidate && !usedPages[i / PAGE_SIZE])
-
79 {
-
80 candidate = i / PAGE_SIZE;
-
81 freePages = 1;
-
82 }
-
83 else if (!usedPages[i / PAGE_SIZE])
-
84 {
-
85 freePages++;
-
86 if (freePages == requiredPages)
-
87 break;
-
88 }
-
89 else
-
90 {
-
91 candidate = 0;
-
92 }
-
93 }
-
94
-
95 if (candidate == 0)
-
96 {
-
97 printf("ERROR: Failed to allocate virtual memory in range [0x%08x -> 0x%08x]\n", beginAddr, endAddr);
-
98 exit(1);
-
99 }
-
100
-
101 // Mark the pages as used
-
102 for (int i = 0; i < requiredPages; i++)
-
103 usedPages.set(candidate+i, true);
-
104
-
105 return candidate*PAGE_SIZE;
-
106}
-
107
-
108uint8_t *Memory::GetRawPtrForAddr(uint32_t addr)
-
109{
-
110 if (!readPages[addr / PAGE_SIZE])
-
111 {
-
112 printf("Read raw ptr from unmapped addr 0x%08x\n", addr);
-
113 exit(1);
-
114 }
-
115
-
116 return &readPages[addr / PAGE_SIZE][addr % PAGE_SIZE];
-
117}
-
118
-
119uint8_t Memory::Read8(uint32_t addr)
-
120{
-
121 if (!readPages[addr / PAGE_SIZE])
-
122 {
-
123 printf("Read8 from unmapped addr 0x%08x\n", addr);
-
124 exit(1);
-
125 }
-
126
-
127 return readPages[addr / PAGE_SIZE][addr % PAGE_SIZE];
-
128}
-
129
-
130uint16_t Memory::Read16(uint32_t addr, bool slow)
-
131{
-
132 if (!slow)
-
133 {
-
134 if (!readPages[addr / PAGE_SIZE])
-
135 {
-
136 return Read16(addr, true);
-
137 }
-
138
-
139 return bswap16(*(uint16_t*)&readPages[addr / PAGE_SIZE][addr % PAGE_SIZE]);
-
140 }
-
141 else
-
142 {
-
143 switch (addr)
-
144 {
-
145 case 0x10158:
-
146 return 0x2; // Some kind of console type (maybe debug vs retail?). xbdm.xex relies on this while booting
-
147 case 0x1015A:
-
148 return 0; // More xbdm.xex nonsense
-
149 case 0x1015C:
-
150 return 0x4f80; // According to assert messages inside xbdm, this is the console's firmware revision
-
151 case 0x1015E:
-
152 return 0; // Setting this to 0x8000 will cause a bunch of extra stuff to happen inside xbdm
-
153 case 0x10164:
-
154 // If bit 9 is set, then xbdm will enforce in-order execution of I/O (EIEIO)
-
155 return 0;
-
156 default:
-
157 printf("Read16 from unmapped address 0x%08x\n", addr);
-
158 exit(1);
+
60 size = (size + PAGE_SIZE) & ~PAGE_SIZE;
+
61
+
62 for (int i = 0; i < size; i += PAGE_SIZE)
+
63 {
+
64 readPages[(baseAddress + i) / PAGE_SIZE] = ((uint8_t*)ret+i);
+
65 writePages[(baseAddress + i) / PAGE_SIZE] = ((uint8_t*)ret+i);
+
66 }
+
67
+
68 return ret;
+
69}
+
70
+
71uint32_t Memory::VirtAllocMemoryRange(uint32_t beginAddr, uint32_t endAddr, uint32_t size)
+
72{
+
73 uint32_t requiredPages = size / PAGE_SIZE;
+
74
+
75 // Find the lowest free range that fits the size
+
76 uint32_t candidate = 0;
+
77 uint32_t freePages = 0;
+
78 for (uint32_t i = beginAddr; i < endAddr; i += PAGE_SIZE)
+
79 {
+
80 if (!candidate && !usedPages[i / PAGE_SIZE])
+
81 {
+
82 candidate = i / PAGE_SIZE;
+
83 freePages = 1;
+
84 }
+
85 else if (!usedPages[i / PAGE_SIZE])
+
86 {
+
87 freePages++;
+
88 if (freePages == requiredPages)
+
89 break;
+
90 }
+
91 else
+
92 {
+
93 candidate = 0;
+
94 }
+
95 }
+
96
+
97 if (candidate == 0)
+
98 {
+
99 printf("ERROR: Failed to allocate virtual memory in range [0x%08x -> 0x%08x]\n", beginAddr, endAddr);
+
100 exit(1);
+
101 }
+
102
+
103 // Mark the pages as used
+
104 for (int i = 0; i < requiredPages; i++)
+
105 usedPages.set(candidate+i, true);
+
106
+
107 AllocInfo info;
+
108 info.baseAddress = candidate*PAGE_SIZE;
+
109 info.regionSize = requiredPages*PAGE_SIZE;
+
110 allocInfo.push_back(info);
+
111
+
112 return candidate*PAGE_SIZE;
+
113}
+
114
+
115uint8_t *Memory::GetRawPtrForAddr(uint32_t addr)
+
116{
+
117 if (!readPages[addr / PAGE_SIZE])
+
118 {
+
119 printf("Read raw ptr from unmapped addr 0x%08x\n", addr);
+
120 exit(1);
+
121 }
+
122
+
123 return &readPages[addr / PAGE_SIZE][addr % PAGE_SIZE];
+
124}
+
125
+
126bool Memory::GetAllocInfo(uint32_t addr, AllocInfo& outInfo)
+
127{
+
128 for (auto& info : allocInfo)
+
129 {
+
130 if (info.baseAddress <= addr && info.baseAddress+info.regionSize > addr)
+
131 {
+
132 outInfo = info;
+
133 return true;
+
134 }
+
135 }
+
136
+
137 printf("Failed to get allocation info for region 0x%08x\n", addr);
+
138 return false;
+
139}
+
140
+
141uint8_t Memory::Read8(uint32_t addr)
+
142{
+
143 if (!readPages[addr / PAGE_SIZE])
+
144 {
+
145 printf("Read8 from unmapped addr 0x%08x\n", addr);
+
146 exit(1);
+
147 }
+
148
+
149 return readPages[addr / PAGE_SIZE][addr % PAGE_SIZE];
+
150}
+
151
+
152uint16_t Memory::Read16(uint32_t addr, bool slow)
+
153{
+
154 if (!slow)
+
155 {
+
156 if (!readPages[addr / PAGE_SIZE])
+
157 {
+
158 return Read16(addr, true);
159 }
-
160 }
-
161}
-
162
-
163uint32_t Memory::Read32(uint32_t addr, bool slow)
-
164{
-
165 if (!slow)
-
166 {
-
167 if (!readPages[addr / PAGE_SIZE])
-
168 {
-
169 return Read32(addr, true);
-
170 }
-
171
-
172 return bswap32(*(uint32_t*)&readPages[addr / PAGE_SIZE][addr % PAGE_SIZE]);
-
173 }
-
174 else
-
175 {
-
176 switch (addr)
-
177 {
-
178 case 0x10156:
-
179 return 0x2000000; // Setting this to 0x2000000 causes some kind of memory address to be set to 1
+
160
+
161 return bswap16(*(uint16_t*)&readPages[addr / PAGE_SIZE][addr % PAGE_SIZE]);
+
162 }
+
163 else
+
164 {
+
165 switch (addr)
+
166 {
+
167 case 0x10158:
+
168 return 0x2; // Some kind of console type (maybe debug vs retail?). xbdm.xex relies on this while booting
+
169 case 0x1015A:
+
170 return 0; // More xbdm.xex nonsense
+
171 case 0x1015C:
+
172 return 0x4f80; // According to assert messages inside xbdm, this is the console's firmware revision
+
173 case 0x1015E:
+
174 return 0; // Setting this to 0x8000 will cause a bunch of extra stuff to happen inside xbdm
+
175 case 0x10164:
+
176 // If bit 9 is set, then xbdm will enforce in-order execution of I/O (EIEIO)
+
177 return 0;
+
178 case 0x8e03860a: // Some kind of weird page mapped by the OS
+
179 return 0;
180 default:
-
181 printf("Read32 from unmapped address 0x%08x\n", addr);
+
181 printf("Read16 from unmapped address 0x%08x\n", addr);
182 exit(1);
183 }
184 }
185}
186
-
187uint64_t Memory::Read64(uint32_t addr)
+
187uint32_t Memory::Read32(uint32_t addr, bool slow)
188{
-
189 if (!readPages[addr / PAGE_SIZE])
+
189 if (!slow)
190 {
-
191 printf("Read64 from unmapped addr 0x%08x\n", addr);
-
192 exit(1);
-
193 }
-
194
-
195 return bswap64(*(uint64_t*)&readPages[addr / PAGE_SIZE][addr % PAGE_SIZE]);
-
196}
-
197
-
198void Memory::Write8(uint32_t addr, uint8_t data)
-
199{
-
200 if (!writePages[addr / PAGE_SIZE])
-
201 {
-
202 printf("Write8 to unmapped addr 0x%08x\n", addr);
-
203 exit(1);
-
204 }
-
205
-
206 writePages[addr / PAGE_SIZE][addr % PAGE_SIZE] = data;
-
207}
-
208
-
209void Memory::Write16(uint32_t addr, uint16_t data)
-
210{
-
211 if (!writePages[addr / PAGE_SIZE])
-
212 {
-
213 printf("Write16 to unmapped addr 0x%08x\n", addr);
-
214 exit(1);
-
215 }
-
216
-
217 *(uint16_t*)&writePages[addr / PAGE_SIZE][addr % PAGE_SIZE] = bswap16(data);
-
218}
-
219
-
220void Memory::Write32(uint32_t addr, uint32_t data)
-
221{
-
222 if (!writePages[addr / PAGE_SIZE])
-
223 {
-
224 printf("Write32 to unmapped addr 0x%08x\n", addr);
-
225 exit(1);
-
226 }
-
227
-
228 *(uint32_t*)&writePages[addr / PAGE_SIZE][addr % PAGE_SIZE] = bswap32(data);
-
229}
-
230
-
231void Memory::Write64(uint32_t addr, uint64_t data)
-
232{
-
233 if (!writePages[addr / PAGE_SIZE])
-
234 {
-
235 printf("Write64 to unmapped addr 0x%08x\n", addr);
-
236 exit(1);
-
237 }
-
238
-
239 *(uint64_t*)&writePages[addr / PAGE_SIZE][addr % PAGE_SIZE] = bswap64(data);
-
240}
+
191 if (!readPages[addr / PAGE_SIZE])
+
192 {
+
193 return Read32(addr, true);
+
194 }
+
195
+
196 return bswap32(*(uint32_t*)&readPages[addr / PAGE_SIZE][addr % PAGE_SIZE]);
+
197 }
+
198 else
+
199 {
+
200 switch (addr)
+
201 {
+
202 case 0x10156:
+
203 return 0x2000000; // Setting this to 0x2000000 causes some kind of memory address to be set to 1
+
204 default:
+
205 printf("Read32 from unmapped address 0x%08x\n", addr);
+
206 exit(1);
+
207 }
+
208 }
+
209}
+
210
+
211uint64_t Memory::Read64(uint32_t addr)
+
212{
+
213 if (!readPages[addr / PAGE_SIZE])
+
214 {
+
215 printf("Read64 from unmapped addr 0x%08x\n", addr);
+
216 exit(1);
+
217 }
+
218
+
219 return bswap64(*(uint64_t*)&readPages[addr / PAGE_SIZE][addr % PAGE_SIZE]);
+
220}
+
221
+
222void Memory::Write8(uint32_t addr, uint8_t data)
+
223{
+
224 if (!writePages[addr / PAGE_SIZE])
+
225 {
+
226 printf("Write8 to unmapped addr 0x%08x\n", addr);
+
227 exit(1);
+
228 }
+
229
+
230 writePages[addr / PAGE_SIZE][addr % PAGE_SIZE] = data;
+
231}
+
232
+
233void Memory::Write16(uint32_t addr, uint16_t data)
+
234{
+
235 if (!writePages[addr / PAGE_SIZE])
+
236 {
+
237 printf("Write16 to unmapped addr 0x%08x\n", addr);
+
238 exit(1);
+
239 }
+
240
+
241 *(uint16_t*)&writePages[addr / PAGE_SIZE][addr % PAGE_SIZE] = bswap16(data);
+
242}
+
243
+
244void Memory::Write32(uint32_t addr, uint32_t data)
+
245{
+
246 if (!writePages[addr / PAGE_SIZE])
+
247 {
+
248 printf("Write32 to unmapped addr 0x%08x\n", addr);
+
249 exit(1);
+
250 }
+
251
+
252 *(uint32_t*)&writePages[addr / PAGE_SIZE][addr % PAGE_SIZE] = bswap32(data);
+
253}
+
254
+
255void Memory::Write64(uint32_t addr, uint64_t data)
+
256{
+
257 if (!writePages[addr / PAGE_SIZE])
+
258 {
+
259 printf("Write64 to unmapped addr 0x%08x\n", addr);
+
260 exit(1);
+
261 }
+
262
+
263 *(uint64_t*)&writePages[addr / PAGE_SIZE][addr % PAGE_SIZE] = bswap64(data);
+
264}
+
AllocInfo
Definition memory.h:6
diff --git a/d8/dc6/classXexLoader.html b/d8/dc6/classXexLoader.html index 19d7c94..dbdfd35 100644 --- a/d8/dc6/classXexLoader.html +++ b/d8/dc6/classXexLoader.html @@ -178,7 +178,7 @@

-

Definition at line 223 of file xex.cpp.

+

Definition at line 227 of file xex.cpp.

@@ -253,7 +253,7 @@

-

Definition at line 233 of file xex.cpp.

+

Definition at line 237 of file xex.cpp.

@@ -301,7 +301,7 @@

-

Definition at line 228 of file xex.cpp.

+

Definition at line 232 of file xex.cpp.

@@ -320,7 +320,7 @@

-

Definition at line 244 of file xex.cpp.

+

Definition at line 248 of file xex.cpp.

diff --git a/d9/d08/structAllocInfo-members.html b/d9/d08/structAllocInfo-members.html new file mode 100644 index 0000000..65691d5 --- /dev/null +++ b/d9/d08/structAllocInfo-members.html @@ -0,0 +1,89 @@ + + + + + + + +Waternoose, the XBOX 360 emulator: Member List + + + + + + + + + + + +
+
+ + + + + + +
+
Waternoose, the XBOX 360 emulator +
+
A very young XBOX 360 emulator that aims to boot games some day
+
+
+ + + + + + + + +
+
+ + +
+
+
+
+
+
Loading...
+
Searching...
+
No Matches
+
+
+
+
+ +
+
+
AllocInfo Member List
+
+
+ +

This is the complete list of members for AllocInfo, including all inherited members.

+ + + +
baseAddress (defined in AllocInfo)AllocInfo
regionSize (defined in AllocInfo)AllocInfo
+ +
+Generated by doxygen 1.10.0 +
+ + diff --git a/dc/d18/memory_8h_source.html b/dc/d18/memory_8h_source.html index 37a4f3a..86a2399 100644 --- a/dc/d18/memory_8h_source.html +++ b/dc/d18/memory_8h_source.html @@ -88,29 +88,39 @@
2
3#include <stdint.h>
4
-
5namespace Memory
+
+
5struct AllocInfo
6{
-
7
-
8void Initialize();
-
9void Dump();
+
7 uint32_t baseAddress;
+
8 uint32_t regionSize;
+
9};
+
10
-
15void* AllocMemory(uint32_t baseAddress, uint32_t size);
+
11namespace Memory
+
12{
+
13
+
14void Initialize();
+
15void Dump();
16
-
23uint32_t VirtAllocMemoryRange(uint32_t beginAddr, uint32_t endAddr, uint32_t size);
-
24
-
25uint8_t* GetRawPtrForAddr(uint32_t addr);
-
26
-
27uint8_t Read8(uint32_t addr);
-
29uint16_t Read16(uint32_t addr, bool slow = false);
-
30uint32_t Read32(uint32_t addr, bool slow = false);
-
31uint64_t Read64(uint32_t addr);
-
32
-
33void Write8(uint32_t addr, uint8_t data);
-
34void Write16(uint32_t addr, uint16_t data);
-
35void Write32(uint32_t addr, uint32_t data);
-
36void Write64(uint32_t addr, uint64_t data);
-
37
-
38}
+
21void* AllocMemory(uint32_t baseAddress, uint32_t size);
+
22
+
29uint32_t VirtAllocMemoryRange(uint32_t beginAddr, uint32_t endAddr, uint32_t size);
+
30
+
31uint8_t* GetRawPtrForAddr(uint32_t addr);
+
32bool GetAllocInfo(uint32_t addr, AllocInfo& info);
+
33
+
34uint8_t Read8(uint32_t addr);
+
36uint16_t Read16(uint32_t addr, bool slow = false);
+
37uint32_t Read32(uint32_t addr, bool slow = false);
+
38uint64_t Read64(uint32_t addr);
+
39
+
40void Write8(uint32_t addr, uint8_t data);
+
41void Write16(uint32_t addr, uint16_t data);
+
42void Write32(uint32_t addr, uint32_t data);
+
43void Write64(uint32_t addr, uint64_t data);
+
44
+
45}
+
diff --git a/de/de7/structAllocInfo.html b/de/de7/structAllocInfo.html new file mode 100644 index 0000000..010b7f1 --- /dev/null +++ b/de/de7/structAllocInfo.html @@ -0,0 +1,134 @@ + + + + + + + +Waternoose, the XBOX 360 emulator: AllocInfo Struct Reference + + + + + + + + + + + +
+
+ + + + + + +
+
Waternoose, the XBOX 360 emulator +
+
A very young XBOX 360 emulator that aims to boot games some day
+
+
+ + + + + + + + +
+
+ + +
+
+
+
+
+
Loading...
+
Searching...
+
No Matches
+
+
+
+
+ +
+
+
+Public Attributes | +List of all members
+
AllocInfo Struct Reference
+
+
+ + + + + + +

+Public Attributes

uint32_t baseAddress
 
uint32_t regionSize
 
+

Detailed Description

+
+

Definition at line 5 of file memory.h.

+

Member Data Documentation

+ +

◆ baseAddress

+ +
+
+ + + + +
uint32_t AllocInfo::baseAddress
+
+ +

Definition at line 7 of file memory.h.

+ +
+
+ +

◆ regionSize

+ +
+
+ + + + +
uint32_t AllocInfo::regionSize
+
+ +

Definition at line 8 of file memory.h.

+ +
+
+
The documentation for this struct was generated from the following file: +
+ +
+Generated by doxygen 1.10.0 +
+ + diff --git a/df/d0a/main_8cpp_source.html b/df/d0a/main_8cpp_source.html index a1d330e..f671933 100644 --- a/df/d0a/main_8cpp_source.html +++ b/df/d0a/main_8cpp_source.html @@ -139,25 +139,30 @@
53 std::atexit(Memory::Dump);
54
55 xam = new XexLoader((uint8_t*)xam_buf, xam_size, ".waternoose/SystemRoot/xam.xex");
-
56 // XexLoader loader((uint8_t*)buf, size);
-
57
-
58 mainThreadStackSize = xam->GetStackSize();
-
59 mainThread = new CPUThread(xam->GetEntryPoint(), xam->GetStackSize(), *xam);
-
60 mainThread->SetArg(0, 0xBCBCBCBC);
-
61 mainThread->SetArg(1, 1);
-
62 mainThread->SetArg(2, 0);
-
63
-
64 std::atexit(atexit_handler);
-
65
-
66 while (1)
-
67 {
-
68 mainThread->Run();
-
69 }
+
56 XexLoader loader((uint8_t*)buf, size, argv[0]);
+
57
+
58#if 1
+
59 mainThreadStackSize = xam->GetStackSize();
+
60 mainThread = new CPUThread(xam->GetEntryPoint(), xam->GetStackSize(), *xam);
+
61 mainThread->SetArg(0, 0xBCBCBCBC);
+
62 mainThread->SetArg(1, 1);
+
63 mainThread->SetArg(2, 0);
+
64#else
+
65 mainThreadStackSize = loader.GetStackSize();
+
66 mainThread = new CPUThread(loader.GetEntryPoint(), loader.GetStackSize(), loader);
+
67#endif
+
68
+
69 std::atexit(atexit_handler);
70
-
71 delete mainThread;
-
72
-
73 return 0;
-
74}
+
71 while (1)
+
72 {
+
73 mainThread->Run();
+
74 }
+
75
+
76 delete mainThread;
+
77
+
78 return 0;
+
79}
diff --git a/doxygen_crawl.html b/doxygen_crawl.html index 0aa8e95..c6bc285 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -17,6 +17,8 @@ + + diff --git a/hierarchy.html b/hierarchy.html index 1bc6f09..4d066df 100644 --- a/hierarchy.html +++ b/hierarchy.html @@ -79,21 +79,22 @@

Go to the graphical class hierarchy

This inheritance list is sorted roughly, but not completely, alphabetically:
[detail level 12]
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
 CbasicCompression_t
 CfileFormatInfo_t
 ▼CIModule
 CXexLoader
 CimportHeader_t
 ClibraryHeader_t
 CmspackMemoryFile_t
 CnormalCompressionBlock_t
 CnormalCompressionHeader_t
 CoptionalHeader_tFollowing the XEX header are xexHeader_t::optional_header_count optional headers, which either contain an offset to a struct, or a value
 CpageDescriptor_t
 Cuint128_t
 CxexExport_t
 CxexHeader_tThe header of a .xex file
 CxexLibrary_t
 CAllocInfo
 CbasicCompression_t
 CfileFormatInfo_t
 ▼CIModule
 CXexLoader
 CimportHeader_t
 ClibraryHeader_t
 CmspackMemoryFile_t
 CnormalCompressionBlock_t
 CnormalCompressionHeader_t
 CoptionalHeader_tFollowing the XEX header are xexHeader_t::optional_header_count optional headers, which either contain an offset to a struct, or a value
 CpageDescriptor_t
 Cuint128_t
 CxexExport_t
 CxexHeader_tThe header of a .xex file
 CxexLibrary_t
diff --git a/inherit_graph_0.map b/inherit_graph_0.map index 1d935f4..e128ba0 100644 --- a/inherit_graph_0.map +++ b/inherit_graph_0.map @@ -1,3 +1,3 @@ - + diff --git a/inherit_graph_0.md5 b/inherit_graph_0.md5 index 27d0f6b..8c0ed38 100644 --- a/inherit_graph_0.md5 +++ b/inherit_graph_0.md5 @@ -1 +1 @@ -00e08df6dde167c02070b902ea438860 \ No newline at end of file +0352d315acd3373aa2a65e9b5d4f953f \ No newline at end of file diff --git a/inherit_graph_0.png b/inherit_graph_0.png index 9eac345dcc25a00273cbd76dd97fb8638f63d43f..001ac113cf54dd7baa8f53769b0bc44c6a740a64 100644 GIT binary patch delta 1150 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 - + diff --git a/inherit_graph_1.md5 b/inherit_graph_1.md5 index fbf5a9a..27d0f6b 100644 --- a/inherit_graph_1.md5 +++ b/inherit_graph_1.md5 @@ -1 +1 @@ -2331817039b9d873ce94493cdf722289 \ No newline at end of file +00e08df6dde167c02070b902ea438860 \ No newline at end of file diff --git a/inherit_graph_1.png b/inherit_graph_1.png index e6b014c5f9ca46eaca6a86a19b7e02e2dfff0182..9eac345dcc25a00273cbd76dd97fb8638f63d43f 100644 GIT binary patch literal 2309 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 c#J`gN16tJ2Kr~I?djJ3c07*qoM6N<$f - + diff --git a/inherit_graph_10.md5 b/inherit_graph_10.md5 index d63fba5..eedbee2 100644 --- a/inherit_graph_10.md5 +++ b/inherit_graph_10.md5 @@ -1 +1 @@ -f719b1ccba541a3765f982328a0162da \ No newline at end of file +28f10d573ab1dc424e0571f9bee132d9 \ No newline at end of file diff --git a/inherit_graph_10.png b/inherit_graph_10.png index a70d4c1b499c5cf4d72ffdb3407665c09f05ff74..5f57f071b61ecd3f686d4e4afd6a977718839ee4 100644 GIT binary patch literal 2056 zcmY*adpwiv8-JA3XT(M?YqlJ6$|;J%Z9F|5URLiMyN>NFPym!CP@1OU&KhJaDpU-{Y*K=Lh_xrt`%)K7ObubhRf}nM7 zB!U;1Q^2FIC=cE)u45`-lBew^5}?)JqgYsa1%ecWZUj6fu5h-%mqZ!X>}U>tdZRY~ zKD)Q&A2VJ|FC%8J_Iet+J@UTd(ouE!={Wo(Er2?fszW9(^g7>^_dMo;&)MR3>FOUB z18@D^g&=wwJ#!PGx7cFut)~7RBJe$&v|@XsmcMv7EOGHAGy2>0X!()<8(V2xqpp=z z-^Bp-rHk-39uD5uI5swR-R~7WNR@^(ObcM2n=xVruKljra@$Yq{rX4Bwc%2qXdCp* zo~WqLf?2`I7p?Q!>87$O&_UgZ<+T4Sm}u=)vGIDCva0G@2+3%@Zhu-QPmEAk=ZB+~ zmX?YsCi9=)iBB@?uP*1trcFEP*4w!g85tQlSbJjlT8Abqz3$BFulu6? z6pEuBOGih?-`l40&agw%rjQz+GK$HrxH*WJg~rqAW*{ojw}JkCU0q!n7K=q9ky<*k zwTE!2t!KYXNXF+z+v<{5urMX1$e-ViLoL0%@cVpznAdAe&$&f<3SQWpf1m3ma#6){qVBq}JGb2*T zQ-kP;(MNI*9zN7FHC4*qXiu9cVzFe>os#*%l3NuOVQ-K^p-|~bEUx*?BW=x;t|O0x zrxyn~%yyb_E;%PRw>89C&)Rx@0#18=e%>D`ub{dyZHO+))^>oS(aInTbt4bQyZbi* z?;u(>o9## zK;!ZF$=TU-FD`*dRN#1RHq%f7sT~%?C386XAKnPHc5PJk_V(WWe&lifwusnRBAE;W z$6Q@q;cz%4Je*xux0Bryl+jK@Dl=@Y&}g(q;S9aGB8yyty_%Cl5WC#&gG1$2Rl%>q zU)SN2l9D(BGu*m5_Hk__Qil;x#^+xllgT7A4Su2qGhHAM7@L|hKfbPawu}A9>FRQO z=wN8b01#znbPf&WcZCcCU_Yeq0MMYoV_h{+evb_eP zoBTdM{#+{UdBW#%Gcz*chAp|a91MH3Wrm%v$KPqN&ZT9Jlh!iX>6>WX>4NRgvZN#Pr%XXcbvn4E1$bBx+Q?t zP)lp83{XL*Sj?ZE`0_(3)Uu$btgOs2JlrA%D^2+Z%-GyK9We0c;wMipuQmDZj5~J> z6=m0aU0n1X62vdS^jL~5F#(m<3d(^iUFZ1xZ9cxfcVEgYDDaMouNnka8dO9jJfND@ zMZJTaos#R4NQeZ2EDD9vVUge%%sSkSY@oe18qYs86b8g-yk!f~*H;TFuCLFxzal=e zRgkoTT3!C4Di8{Ji9b()=0Z7eK%#YqPFLn~xz#l_fTRbXHx(B{pg`5NwddRooqc>z z00)ss1VqDwIXOAjL5os>V3(d=cTbN&vZEuQ_S=yWN0Z$1KtqT>KOtUArEdCatlHWg zLoZ+czEo3F!)wsEzXPePua?=_-=9m+L)hBd_SJ+9RDJ-c{r+T85vFlVUx@YF>FMsQ z0wIxVtUw@;OD^xSx1SnqJ4aVGGBWzSxM+mCv1e*(>Wheaekdug&FOTS_vW+>^Ru(F z&!0YhWPwEV&COYI`$LzO7EBR{bt)=ehYn#9SAP{@?d-T!RoMWSP8x47KqxmSr}|-P zYAR=cgo)mobqy$?W6p^I^Tek(b3z0yRE2;(H}0jZu-4MD$@(P zj@*j<^oBPuK0Z$I_O7W!ySuwza=m@CsR>tsw6U@II{T_tF3_w!At{e`2o_+F@O>^B zD9TsI=k8TB2E%P^Jl)>3{n~I(t7~;osXSnGTwGk`pa1bMYYDbMjC57xse7RR910 delta 1239 zcmV;|1StE65ZMVKiBL{Q4GJ0x0000DNk~Le000100000a2nGNE0Qie`K9M05e*}(6 zL_t(&f$f=FD0E#I$NzhL>cxc|BFz|-B8PIU=`E+4l2cqb=R%D=h)5)%hKs?43vneb zh~h;e7idg!`W!OOVy498Lu4GA3x)k%yuJG~#$mph+2noq?`}P7&GUcOf7aTwXDxt* zg@uL1ToBI#IXO8zf*`(sMloLze~P01Zf|e@=V|P(=Yt4>_)ZYSkB=+s%aaD6?`c5K z)L*o=wlZGLS0^_&_r*BpgX{PsU`=HJ)>H;yO=SSqR0d#8WdKG^Jv}{zP$)Dh$I{Xg z8XFsRVmCK8sI9FyGvkeQhY4-XFrg+feBOaK64V`Cwc$&i$k zgvZB62m}J`@9!I>Z#GDhOcjg8)JGE%5<(3P4bkn2iVDic#)bkw<>chh@q>c{3IL^6 ztLa!lK>?MVoJ^_JY6<|gf4jR&_j!AJQ_aoI|6AV>#9}c;l4R<04^3XFDwPVUsk(WK zii$8fIf?W0b9(!$R4R}piShAqq@<)EF)CO!7(=m_raf9`M2;U#@jFxk}G z+gr@f&+EiiS66X%c80sVJ4{VY(c=aN22fX5hpenD1O^5oGcyw#8yhGtE(V{^M_yhY z{UzAi+QQk{88$XHI=O>_g3#5~MYm5*PSDlWg_xKaeEaqd!^6W!OG|^lzdv|99z-G$ z5)u;LoWo1{rtqP^fBsijSLp8UMq*+jYHDiWc7UT2P#b9;NSpPS68}i zXJ=Vj07h3|A_ZIxA~`e;-^f7aY!i8<5ZEV{viOEV_nb^7gl~ zvck#93Djye0AOZj20J@DM&-J{zkhek?CdP2r>D`=)1$Xl!^6X|u&{uYl@$O#-&s35 zI}sTfX*PXBe=vEadU<&vDk=)TzP|AD^TW~65ds1NjLK79UXF){2feq6r_9aG;qLAZ zUS3{0@vyKk^!4>YDwQH4A_8u1Za6$VL{wB1Dl03^rf&!)n`&WU0hvsOt*tFwUS7h} z(-YU%*Kl-ngsrVD_kKX>Dz7 zhFz!pPAC)#G&D54+8-Jkit_Suv+4a2rUnNGqrboZ!}QprKL%h;WdPPx24L^~89>ie z4u^C2E%^92pin42qnDi>>5~DSXh2%{sq^Mh-O+FIFA4T002ovPDHLkV1im8 BI;Q{t diff --git a/inherit_graph_11.map b/inherit_graph_11.map index ede39f1..2f7bc0e 100644 --- a/inherit_graph_11.map +++ b/inherit_graph_11.map @@ -1,3 +1,3 @@ - + diff --git a/inherit_graph_11.md5 b/inherit_graph_11.md5 index 7a5a53b..d63fba5 100644 --- a/inherit_graph_11.md5 +++ b/inherit_graph_11.md5 @@ -1 +1 @@ -68de2b43a7acd2f16165639f8b0a689d \ No newline at end of file +f719b1ccba541a3765f982328a0162da \ No newline at end of file diff --git a/inherit_graph_11.png b/inherit_graph_11.png index 5cb2f5b0048aafa0f02534b2a6c8645a0531ca8a..a70d4c1b499c5cf4d72ffdb3407665c09f05ff74 100644 GIT binary patch delta 1239 zcmV;|1StEH3)u-FiBL{Q4GJ0x0000DNk~Le000100000a2nGNE0Qie`K9M05e*}(6 zL_t(&f$f=FD0E#I$NzhL>cxc|BFz|-B8PIU=`E+4l2cqb=R%D=h)5)%hKs?43vneb zh~h;e7idg!`W!OOVy498Lu4GA3x)k%yuJG~#$mph+2noq?`}P7&GUcOf7aTwXDxt* zg@uL1ToBI#IXO8zf*`(sMloLze~P01Zf|e@=V|P(=Yt4>_)ZYSkB=+s%aaD6?`c5K z)L*o=wlZGLS0^_&_r*BpgX{PsU`=HJ)>H;yO=SSqR0d#8WdKG^Jv}{zP$)Dh$I{Xg z8XFsRVmCK8sI9FyGvkeQhY4-XFrg+feBOaK64V`Cwc$&i$k zgvZB62m}J`@9!I>Z#GDhOcjg8)JGE%5<(3P4bkn2iVDic#)bkw<>chh@q>c{3IL^6 ztLa!lK>?MVoJ^_JY6<|gf4jR&_j!AJQ_aoI|6AV>#9}c;l4R<04^3XFDwPVUsk(WK zii$8fIf?W0b9(!$R4R}piShAqq@<)EF)CO!7(=m_raf9`M2;U#@jFxk}G z+gr@f&+EiiS66X%c80sVJ4{VY(c=aN22fX5hpenD1O^5oGcyw#8yhGtE(V{^M_yhY z{UzAi+QQk{88$XHI=O>_g3#5~MYm5*PSDlWg_xKaeEaqd!^6W!OG|^lzdv|99z-G$ z5)u;LoWo1{rtqP^fBsijSLp8UMq*+jYHDiWc7UT2P#b9;NSpPS68}i zXJ=Vj07h3|A_ZIxA~`e;-^f7aY!i8<5ZEV{viOEV_nb^7gl~ zvck#93Djye0AOZj20J@DM&-J{zkhek?CdP2r>D`=)1$Xl!^6X|u&{uYl@$O#-&s35 zI}sTfX*PXBe=vEadU<&vDk=)TzP|AD^TW~65ds1NjLK79UXF){2feq6r_9aG;qLAZ zUS3{0@vyKk^!4>YDwQH4A_8u1Za6$VL{wB1Dl03^rf&!)n`&WU0hvsOt*tFwUS7h} z(-YU%*Kl-ngsrVD_kKX>Dz7 zhFz!pPAC)#G&D54+8-Jkit_Suv+4a2rUnNGqrboZ!}QprKL%h;WdPPx24L^~89>ie z4u^C2E%^92pin42qnDi>>5~DSXh2%{sq^Mh-O+FIFA4T002ovPDHLkV1joq BI;{Wz delta 1426 zcmV;D1#SA-36l#UiBL{Q4GJ0x0000DNk~Le0001D0000a2nGNE0CJ@7e~}>+e+5WM zL_t(&f$f@KNK<_n$G>O2Hm6(aoDu4V3NG+pR4Ta(^+FsP#~fv%yX{OY(6I2v=q_B{ z1qDSR7CLkjl)5Op40*db6Ew&_n1wTh{_0qxhVyx^-0PZWZnoTcU(W~5#hyLS?|Gi{ zJ?A{<>CdyN&cRm9+*rff0UM%#?*Hw zL?;9QR905v^y$-a$^GKR3zV0aN3?UJ@!g5vo)H5B1GseQQsDFW_&CgFGyHx(+-^6n zU%!rqh6Z$Wbl}~)cRR-HCfCf&3^rl!!+f6@Z8*^IflIb6GT4R*UdB>z^fUcDNz@2=oD?!3ifp-Az1 zy`ujWHy`0;c!rAXD6knr_<-pp9N!xh*DEiskpe9 zs;jGmw%fOF3&!z0Pl<_%l%JnZeSLj&^X5%bDwSlj*~sJZkWQzgf7aGkvfJ&{-ri1X zwVFPD{75{{lUA#x^73-(>FJ^A>1iq~ETlVk?$DPnU&8jiw6qkl?^Y}p3vnEG{@4Bf z+m|MVLV^DNewa)qjE#+n%A`uqEF<;s<9 zV>YR)s|%SC`T6;Rf4Q7aCw~0+fsv6Bl$4YJ0FslFVYOP}cDtcgt1&n@2mokmYQo#M zZ*lM5J=E9N!{u_}`Sa%}C@2W@lbxLnwOSpvZ>?4vv2P^AWJXj}RN%~+GjKQ@`0(Ka z0APB08a|&7H8nK>zs1ExXfztZm`%dX2%$KYN)-?R0II60f6&#{g*R{BprWE8XbpqG zfSH*Y)YsSJ(4j*C5#mWqg!uaPE1o@j28BX_(a}+~wzfi{P{3d?ptrX-$XBUU3dZa< z7XWy@Ui|#|6LPs60PyYGH>gx9q@|@{Zf-7Ujn&mvq@<((0FsiDeyjIb5t9eH_V#u( zH#fs(v!SD-e*-HkE2yol#mkp3aq!?l96fpz85tR1Sr!u$6M`|j%>@8{zaO`5-2wpk zd_GvMRv3*&7>!0eefku$v$FsIm&*m4%?6{dh&X` zL_~D);zeRvmWYUM+_*t1m5NGAN=Ttl5XW)k_xr=ff25|Sl1`_iqN1XZt*@_d+c=)* zDJ?CHSeB){ygbrqG<5veMO7<#Md8 ztzmwCe;!#`S;)-H+%bmddBLMhsZ=5(BO@d(At3>0&z{A~$_f@27vb~ypx5gmll^J}q82|tP diff --git a/inherit_graph_12.map b/inherit_graph_12.map index 0dd5b94..ede39f1 100644 --- a/inherit_graph_12.map +++ b/inherit_graph_12.map @@ -1,3 +1,3 @@ - + diff --git a/inherit_graph_12.md5 b/inherit_graph_12.md5 index e5d2077..7a5a53b 100644 --- a/inherit_graph_12.md5 +++ b/inherit_graph_12.md5 @@ -1 +1 @@ -85b49101ee9d9b81942754be4d9b7dbb \ No newline at end of file +68de2b43a7acd2f16165639f8b0a689d \ No newline at end of file diff --git a/inherit_graph_12.png b/inherit_graph_12.png index 3537ed09bb5196e09320955b36ccc6a0e5b427eb..5cb2f5b0048aafa0f02534b2a6c8645a0531ca8a 100644 GIT binary patch delta 1425 zcmV;C1#bHA3X=;ViBL{Q4GJ0x0000DNk~Le0001D0000a2nGNE0CJ@7e~}>-e@ID0 zK~!jg?V4XmQ+*i6zh}KRr(5cr5$c8tF7RJeD!B{wLL3^$9A%=r?My7tu<*v{E?nIO z1w|niI&>41x+uF0dAm6iG{`@gg)@Zy>R6+O^Lek_>zZe7w%mDN&j-%Mo;}a+d7kq< z=RD`^43LnJkdTnr9_ClWg$oz5e;I}`#G{z~0ulZF@ZrPdt+u~@bz&ICz%b14-j%g4 zX$D~5Y6uZxll%AY|M6<}BW-PM+uCJ&T!(}Jk`N+65<(E~p{+^y5m`o;=f0mZU)OROD zCjC&Za1!9 zzmA5626S|E;N81-JI3rL*UZceIF7^6&=5=}6IxnY@Z`ypfZwN2pU~ai4VGnb`SN8f zEiC~6=I7_ZaU7y+qZ8E#_>E)iHV7npPx^CeSLKE=1o#6m1MKo$m8*lPN$>Rf7VvA+wIie-cD+@ znm&H~NIcJzR;#7*@^b3w>7nWAX(}u%q&s)+(3dY?!uGwiv=p)LRxB0^aU6I4*Zuz6 zmnMZmf&Tt}m`o;&jg6tPu@SYkwRrsaG2Cu99zA-50|yS^+_`gj|NcGt`}=X_%9U+n zHmR$t3z-r5`T2smf1FMye*E}>k&zLUl#~Dfl9Q8RwOZkJyP;OAF*rB~0BCAz!rQlR zaqr$e)YsR;<#OTq^XDiiC+|`1G#{QUV7a=9D;@a@|-s8lMXrKMqRZZ2qz)zwv`q@(}4@ZdolJ$e)w85v+%784T_f-$?z1pt1(AGdDZ0s#1Y zK3J_*7>!04jYd3u`V_OXvj6~>%LSXw2BXm^m}7l?J>uS@@r{aThxNd~0O|F5@_M~Q zM0D}uMPgZ&h=^|7xIrqFib_gKNTE;=$8qHM`@_bhf2O9APN$=yqN0$kudi?0IG*Pz zEiH{$mZiMBJkn@1bo}^nT3%ib)RCN=OvjELBc)PFU0q#7M8xwv9XWC&s2{W0OnG^E zG(0@KWAD-UZXz_SLtd3~9Cw~!nBhoY3{6f>LZi_@r_%udzJLD?p67Au)G5g2a;&Yb zVSaude_2^s$jr>#F^1=P!J|y6R3alIBP1>%ApvL4p2f<_3Kka^;q&>R*XtpZ{d>Z% zuC8KXVF9_hxq*j6kH>@8uU`kvkoEO-OifKetJUK0;lp8jkH&YCwzf79QS*Zb55nK` zMteqxf$ffLvGT`mU&Vl2E=NvIPE6NyI-RguXRU(Ymz9;FySqDP`TiF|6crWW)vH%A zUGwD0lW;g3F3>ZkAw&q7Oy=6y*cfp-o$;t=Um%moT=A|! fLPA19;=jW`ihT!7**v`>00000NkvXXu0mjfxvs`6 delta 1390 zcmV-!1(Eub3-AgdiBL{Q4GJ0x0000DNk~Le0001J0000a2nGNE0A+@Mwvizfe&2!je7VNii13@UJhK?RO5sK6;WgUn_# zUcGvi7Qb@k3Y<=7-s`oux8v5WTY1;b7X@dK+wF#`s%i1j(NTm#p}g07fBW_=0)aqY zHLqU13a{6j7p;Ob=>Ncr7cUTrMDn7wXoFlX7tWkHlRWS3?L~ckJ>u~=rl+TI{rYtr zK71H0EiHKS=FNgR*`lQl0Diw8jg5_{si{F@VOioT}fA)3Z!Uc?vkK@|4Yv}6g(wvtqi#F)Ukt2Bd@+I2a+c7;o z4MkCK;=~Cg5(yZMMub8k96x>>I-L%cm6cFcRWoPBiWLBW%a<>sy1F{$7#J8x)|{Q4 z)zqGvnu5t>f?lu3$&)7`NfP$&-;bG@8GQZv6;)ML2#3S4TCE5Me}iy191Cj3Vlnjg z_QGbfVe8hdkY!nOJ=92R)77Op*y{nl+lEuZvY;A32M@L7>v2*86Ub=K?LG4H+!nU@y zWL#BMN|MBIILv$Zf9|ooyqxiPJUL!nUCoAuhK!nCua^M$`t|Fq)??SMU3~K7NiIuB zo6SZ=QR;s6L-S^7F6`dD8y1TN-QC^EYwyU&2xewxQhr6DPzWU@C7L<&m`o-dI&>%{ z=5o1`pEGH1+_({?rKM-AW<^53tyZrwVJjg6(`OifKKs2Pn$v3m9DtozF+dHEOD+}sSS z)rv=t9-*bBe+841lQ?+rAo~0JQB+if?c29w{rdGVo6T^$-I_Vsl1Y1HWCT@JRj944 zgf3ZD`Qhr6AcCfO(qjb^2UuDT(xQy4F&^cS*FowWJ5zkMoq8R%MBYg zWW6T!_4VAcWeYnyJG0Kw+JhEtkk9Ai#Kc7M{L7aw?Ca~}_wV0HlAk|+=HTEUBaui} zIc~R`f2yjc)fpWfWhfL%iTzG{UT<)4kkM!~InVF+C&yJ)rQ7Z1(9jS+e*DNlAdpcr z7K_p2@npRwv$M1GdcFMc;X~FrS_Y-Plb|R{og_(};)&|gVz=8t(&}_NvwP$%_&q+K z4|nd|(HyU=tVC;TYu@S!gL0&zq5|FB-Ah(aMBIxjaD+hxjxeae5%0wnIB5pybh>wm wM54#%^DRd|e>FOt?%i_tAP@)y0>M200RDMP4Vwnvga7~l07*qoM6N<$f>#r@#sB~S diff --git a/inherit_graph_13.map b/inherit_graph_13.map index 014dec7..0dd5b94 100644 --- a/inherit_graph_13.map +++ b/inherit_graph_13.map @@ -1,3 +1,3 @@ - + diff --git a/inherit_graph_13.md5 b/inherit_graph_13.md5 index 3f25272..e5d2077 100644 --- a/inherit_graph_13.md5 +++ b/inherit_graph_13.md5 @@ -1 +1 @@ -09da64527eb455c7e510c65536087040 \ No newline at end of file +85b49101ee9d9b81942754be4d9b7dbb \ No newline at end of file diff --git a/inherit_graph_13.png b/inherit_graph_13.png index 10f7baeb4a0c2a9357ac464d886fb69cc007bd1b..3537ed09bb5196e09320955b36ccc6a0e5b427eb 100644 GIT binary patch delta 1390 zcmV-!1(EuL4DbpeiBL{Q4GJ0x0000DNk~Le0001J0000a2nGNE0A+@Mwvizfe&2!je7VNii13@UJhK?RO5sK6;WgUn_# zUcGvi7Qb@k3Y<=7-s`oux8v5WTY1;b7X@dK+wF#`s%i1j(NTm#p}g07fBW_=0)aqY zHLqU13a{6j7p;Ob=>Ncr7cUTrMDn7wXoFlX7tWkHlRWS3?L~ckJ>u~=rl+TI{rYtr zK71H0EiHKS=FNgR*`lQl0Diw8jg5_{si{F@VOioT}fA)3Z!Uc?vkK@|4Yv}6g(wvtqi#F)Ukt2Bd@+I2a+c7;o z4MkCK;=~Cg5(yZMMub8k96x>>I-L%cm6cFcRWoPBiWLBW%a<>sy1F{$7#J8x)|{Q4 z)zqGvnu5t>f?lu3$&)7`NfP$&-;bG@8GQZv6;)ML2#3S4TCE5Me}iy191Cj3Vlnjg z_QGbfVe8hdkY!nOJ=92R)77Op*y{nl+lEuZvY;A32M@L7>v2*86Ub=K?LG4H+!nU@y zWL#BMN|MBIILv$Zf9|ooyqxiPJUL!nUCoAuhK!nCua^M$`t|Fq)??SMU3~K7NiIuB zo6SZ=QR;s6L-S^7F6`dD8y1TN-QC^EYwyU&2xewxQhr6DPzWU@C7L<&m`o-dI&>%{ z=5o1`pEGH1+_({?rKM-AW<^53tyZrwVJjg6(`OifKKs2Pn$v3m9DtozF+dHEOD+}sSS z)rv=t9-*bBe+841lQ?+rAo~0JQB+if?c29w{rdGVo6T^$-I_Vsl1Y1HWCT@JRj944 zgf3ZD`Qhr6AcCfO(qjb^2UuDT(xQy4F&^cS*FowWJ5zkMoq8R%MBYg zWW6T!_4VAcWeYnyJG0Kw+JhEtkk9Ai#Kc7M{L7aw?Ca~}_wV0HlAk|+=HTEUBaui} zIc~R`f2yjc)fpWfWhfL%iTzG{UT<)4kkM!~InVF+C&yJ)rQ7Z1(9jS+e*DNlAdpcr z7K_p2@npRwv$M1GdcFMc;X~FrS_Y-Plb|R{og_(};)&|gVz=8t(&}_NvwP$%_&q+K z4|nd|(HyU=tVC;TYu@S!gL0&zq5|FB-Ah(aMBIxjaD+hxjxeae5%0wnIB5pybh>wm wM54#%^DRd|e>FOt?%i_tAP@)y0>M200RDMP4Vwnvga7~l07*qoM6N<$f(4+pw*UYD delta 1538 zcmV+d2L1W)3WE$GiBL{Q4GJ0x0000DNk~Le0001G0000a2nGNE0FZd}29Y5Zf4E6R zK~!jg?V4{$Q(qj$pL;c9F=fNW!sehRSz2O$7PV-BL?pF*5pI>_K)p+oEGP;pdKX6d zvKK{$8CK}bl7zJKg)uB}7843uFoiS`ytQ0}I=62x!u!*<=~h$s%lm=7xaU0IbDn#i z%RPt701*)p5fPE-!2I4&Qc|K~e;7u$5M~x5MATVbUEM#mE&g{A!!SCAVe044)}qG* zpkZo5Kq!;kym@oZ-7I#F9Xl4Zot{w zU%w98H#9Va-Me=K0Gv)Ij7H;pTAMdwE)<*12A=1G_Ql1;L8(*%06ZQKe_p+MHJ{dI zV9ghPi8p{c0}z^_*u$8m5t z95{UVFa`$)@%HUo6c-m`fA8MCC@wC>n>TNQYE32+9zJ|1jL-8ta&mIucDqCRI& zK79Cqix)4Vp`jt9E?oXPl!FHk;>C*>c<|r>Mn*=!aU9HMGyHx(bUGbeE*A<53&FB1 zv|25Ao)1|Q7Z*3T}Dk=iQFv!Wt!T9)ifL5c?;P&m?!W>qs6<)6wGMOx-uahTFLakP# zw6rwfp@|9{#~Cda3q?X_XD2C@N-`RabmGJbA|k4-t)2J{UK3{Z7-wV>m9o*0Iq zzP`Qyt;^-2goFfgyWK=Yv~%Z9x^d&itZT4k%NBb4`0?zEH3f^sLLA2hoK`}9kc@=w z+qWYxFAr9$Rd}!V^z>kSe0_?RoJj$1D-s20=-_3uC6XLH#h&0zdt1^p?vxB z1y7$og+wC3qeqW$ zVHhl1woK67f4zGb=gytOty{Nn?bo0yQ(0Mwef#zW=z4m3uyyNJ?BBm1QmGV;e~pds`F!yE{Xxgg&(B9|Yb$DM zYH;-E(XjnYOiV<44`C7Mo>Es=M{Cxsp&vhf5E0SwfbZP$(!fGm}&*6_u2fP)0@u>Gk>m?IfEvZ6di`PNSovVXZ?!K>@8^y_)Ll z>%(5VIong#ty_oZ&!0mgkpKX$UcCyt-Hx%bF`Pet9_8iba5|k>xpE~^Qc`BEX=!N* z`otwAB_S~}5$)~m0D$!LbTl_NBRe}AA3uHsf6KB+OG^`8U6aRS0LaS9LSJ7W-oJkj zwOS3OQi*ThzM;3b7ino})3lRhXJ2MuufBaP7Q|3u5HXY(MEu`Z3=$9u%d(&Ret%0`)Q#)h=_=Yi2S?!1b(PgAYW}(d;kCd07*qoM6N<$f<^VzTmS$7 diff --git a/inherit_graph_14.map b/inherit_graph_14.map new file mode 100644 index 0000000..014dec7 --- /dev/null +++ b/inherit_graph_14.map @@ -0,0 +1,3 @@ + + + diff --git a/inherit_graph_14.md5 b/inherit_graph_14.md5 new file mode 100644 index 0000000..3f25272 --- /dev/null +++ b/inherit_graph_14.md5 @@ -0,0 +1 @@ +09da64527eb455c7e510c65536087040 \ No newline at end of file diff --git a/inherit_graph_14.png b/inherit_graph_14.png new file mode 100644 index 0000000000000000000000000000000000000000..10f7baeb4a0c2a9357ac464d886fb69cc007bd1b GIT binary patch literal 1539 zcmV+e2K@PnP)K~!jg?V4{$Q(qj$pL;c9F=fNW!sehRSz2O$7PV-BL?pF*5pI>_ zK)p+oEGP;pdKX6dvKK{$8CK}bl7zJKg)uB}7843uFoiS`ytQ0}I=62x!u!*<=~h$s z%lm=7xaU0IbDn#i%RPt701*)p5fPE-!2I4&Qc|K~7)G}cW)>qv)LC6!-9NQ0{&x|> zFgk`|>gUhaqQ?ZFVQND_D3jd0d2`O)EOw3^I~KH^oo62+VIYPQgNUKTAYv#nh!{!? zB8C!!#9Sx_g8{E!zYf|rG&F?WyLSTsoK7c1n>S)E6r0Tkp67%1#l^)zsZ;_0 zJRT2Ty?QmD)@J0wg$uCT?NJ#k=0ceXg+hUQ_wFsUji5Yx_6!3915p|4uS2P;t3!Et zxp3Xq)`o(D0{DDBjEs!n(xpo{aNqzcDk{+1+dFH`ObibX3$L$9y1KehR8)jRhYq2s zsR_WZR~yH1a5x+|eE2X12M6)??OPNV7h~_v(^m;uuZrq5%!a~&4)WGBM zpslS97K;TMjRvEmqtNU1kV>T}Dk=iQFv!Wt!T9)ifL5c?;P&m?!W>qs6<)6wGMOx- zuahTFLakP#w6rwfp@|9{#~Cda3q?X_XD2C@N-`RabmGJbA|k4-t)1#~zPgmid-&7Mn;Bky=&JloH}(1 zM1-WIB%v=QB?U^Q5@ls&a5|mvcsw8?p>C>n)v8t4uwet9Jb41WUXQM>E;Khc|B=5x zB`TqO`SJx%pFV{|BEh3ak8tG35lAEw=yW<%R#r~aN~O|}HIefD`*(P~UMyL%1OV{$ z>sKTvCxc-aEL*lr(A~Xz7w68M!>wDlaP8VPNTpK5$NzWhQ?&q)pP!GWrY3y;{295q zxsc1{5qtX^qH_8wD=UM^WWxRX_fb(%fx*E+?AfyiFJHbyLP7%4)6=nh`EnQx2H0%2 zkTsFw^?FfNRR!SJep6XliGBO_1?YNuda!ltR_x!uA5y6ljg5`)`F!yE{Xxgg&(B9| zYb$DMYH;-E(XjnYOiV<44`C7Mo>Es=M{Cxsp&vhf5E0SwClT<1dm6ViFMn(qd_4)wqB%3yEBDq{nqobo?twTXU0j*xW zn(FK8!(O{N+f&x9TZiY*pF<*%006FDy$ZYCjlpYI-OX#awSqyQf94b zX=w@i#3dyqAu%x#?d|OVfb{fqG&eURJ3AX6KYj$uvPery6JA}D$72A<%F04tUmxDT ze-E`<4W&|vZ{NP5x3?E*X=&56lVoRSL#x$d>C&ZPt;3x=ci?b1keZqr*#d^cpPat_ zHQa7DB_}77&1Rd^dFJ%=^)FFdTZ_}DPa`)s7dv+B004A%cjL;HDe002ovPDHLkV1oDv()9oU literal 0 HcmV?d00001 diff --git a/inherit_graph_2.map b/inherit_graph_2.map index d3b5dda..5273026 100644 --- a/inherit_graph_2.map +++ b/inherit_graph_2.map @@ -1,5 +1,3 @@ - - - + diff --git a/inherit_graph_2.md5 b/inherit_graph_2.md5 index f0d09eb..fbf5a9a 100644 --- a/inherit_graph_2.md5 +++ b/inherit_graph_2.md5 @@ -1 +1 @@ -d50d4329cea0baa4e96ce9034aa26e42 \ No newline at end of file +2331817039b9d873ce94493cdf722289 \ No newline at end of file diff --git a/inherit_graph_2.png b/inherit_graph_2.png index 4484cad9ac42505c509b727b877eb497c009c1d9..e6b014c5f9ca46eaca6a86a19b7e02e2dfff0182 100644 GIT binary patch literal 1734 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 diff --git a/inherit_graph_3.map b/inherit_graph_3.map index d18259e..d3b5dda 100644 --- a/inherit_graph_3.map +++ b/inherit_graph_3.map @@ -1,3 +1,5 @@ - + + + diff --git a/inherit_graph_3.md5 b/inherit_graph_3.md5 index 21ee646..f0d09eb 100644 --- a/inherit_graph_3.md5 +++ b/inherit_graph_3.md5 @@ -1 +1 @@ -4ed908f4b27f0203b54ca87e4f55137e \ No newline at end of file +d50d4329cea0baa4e96ce9034aa26e42 \ No newline at end of file diff --git a/inherit_graph_3.png b/inherit_graph_3.png index 5af20386e81ed86f60bb92f11e4cb8ecdd0c88d4..4484cad9ac42505c509b727b877eb497c009c1d9 100644 GIT binary patch literal 2965 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 literal 1775 zcmV!Q-2%BKbw(Q(^4#>W&|RVNoJ|#LbH%G(;gr*HAJ$_ zdeei1l}0bi+?#q6g%M?z{>$Fji?TOm4GSMh!KvUfy+uvO#HHkH{_Yny_wMHN!)iBp zJ}@}v`d#O`zQ6O`&d$z$AR!?kAt530|A1^_;PmO!N|{Wia)ua*#Uq5Mdhp=EzkZJ` zo0ue%$y73#?4Q3UOTxh<1J8dCOfvbu+`oVSkE@YzELmAuQ^w_gS%-uZkW5|zNG2}< zB$Jl_lF3T|$>b%#qD}7W>mw#6#t~W^Mq*+jpFe+|6wl4grLeHj;r&WVO1N?3hQsSR zibb33;^KmjkB=j?ESS8!JZfueZTmW%4x`aHDX*!i34_7l@cx~ho#^#?ht`}pr^T>n zlfAvYdHVFJBeX1-w{PFl-QDd}4UWcR1{jRmJ=sVV6j+8PENMv78e)WPDn^d2x)0)l$4Y(JUmQj zXeiy?-K3|dW3gBW2??RUzaO*NOhrWn8jS`&KR>Qqxx&Vc8##04jNQG#)vH(8yLYeM z>(i%Cw(+sCF;prQ27`h0^mOEMIbmU87>!0uCKFLnQ79A&PMtc1OeSOBzI|9M7KVq1 z2@emaqoaf5#>TjN_by7M5+5HQ zcJ125ojZ5%_xH!o&yS#>Alp0t=g*&%m6fq|>sA0(u3Sleem+A(LwI?4*}evnl9Fg| zZ|B~TL=3=9Oo&CLy^Qi+$Bmrcik0|(f?eY>5uTeoi6wo6J%7#bSl z@#Dw1xVUia*fBafI(YQx5h*Dt+`fIA%*;#xVq#)=`0yb;Jw3dB{TdGs4_>}}iCiux zH8qv?_V!t8Mn^|a(mfr%zP?k=X`wjW<6UWeN)m(Q36Q6bhCt`_HNJ^75j&x!LX*lgTt|&EDQ#hv;4iPJI|+ zwOT1CC;-4>v5=piPi$-~v9Ynddi9EymKFfIy1IDw>>07KvD4Q2_3PKXdhg%ApAR2C zuzdM)0s;b9vt|v6iHYcRIvN`r2@ek^At3>ULP1$s8CI*6@$qru;^HVTFQ=iQ0f2Ac zzEN6QI%~~^FyA>%hf_`V^z@{rrUpMhKQ?UGKu=E(1qB5}L`0CAn@ebDDBHGeBQP+K zlP6DdjVS@kdu=$uRGDm$VjrYvk49kCO9}4rBX?BbTmmxNu;NzQ&m+(P*4!Q zzP?mcR1g>#NJd5mJ9q9RFE5XXhzPc9*}~?{n+XUAn6>77S;(B`j9RTeuF+`3Tp1l5 z6_u5hLI@$uX0xcOsgq^HNSN{WqQv~j%F03rkz80d*`8UJ(16S4X R^eg}X002ovPDHLkV1mleW!?Y) diff --git a/inherit_graph_4.map b/inherit_graph_4.map index 9bd8454..d18259e 100644 --- a/inherit_graph_4.map +++ b/inherit_graph_4.map @@ -1,3 +1,3 @@ - + diff --git a/inherit_graph_4.md5 b/inherit_graph_4.md5 index 681cb27..21ee646 100644 --- a/inherit_graph_4.md5 +++ b/inherit_graph_4.md5 @@ -1 +1 @@ -71d5d9938faaa29bdf632d4d804c4027 \ No newline at end of file +4ed908f4b27f0203b54ca87e4f55137e \ No newline at end of file diff --git a/inherit_graph_4.png b/inherit_graph_4.png index 923792dfc2444b16daf8f668dbdc516c7569f648..5af20386e81ed86f60bb92f11e4cb8ecdd0c88d4 100644 GIT binary patch literal 1775 zcmV!Q-2%BKbw(Q(^4#>W&|RVNoJ|#LbH%G(;gr*HAJ$_ zdeei1l}0bi+?#q6g%M?z{>$Fji?TOm4GSMh!KvUfy+uvO#HHkH{_Yny_wMHN!)iBp zJ}@}v`d#O`zQ6O`&d$z$AR!?kAt530|A1^_;PmO!N|{Wia)ua*#Uq5Mdhp=EzkZJ` zo0ue%$y73#?4Q3UOTxh<1J8dCOfvbu+`oVSkE@YzELmAuQ^w_gS%-uZkW5|zNG2}< zB$Jl_lF3T|$>b%#qD}7W>mw#6#t~W^Mq*+jpFe+|6wl4grLeHj;r&WVO1N?3hQsSR zibb33;^KmjkB=j?ESS8!JZfueZTmW%4x`aHDX*!i34_7l@cx~ho#^#?ht`}pr^T>n zlfAvYdHVFJBeX1-w{PFl-QDd}4UWcR1{jRmJ=sVV6j+8PENMv78e)WPDn^d2x)0)l$4Y(JUmQj zXeiy?-K3|dW3gBW2??RUzaO*NOhrWn8jS`&KR>Qqxx&Vc8##04jNQG#)vH(8yLYeM z>(i%Cw(+sCF;prQ27`h0^mOEMIbmU87>!0uCKFLnQ79A&PMtc1OeSOBzI|9M7KVq1 z2@emaqoaf5#>TjN_by7M5+5HQ zcJ125ojZ5%_xH!o&yS#>Alp0t=g*&%m6fq|>sA0(u3Sleem+A(LwI?4*}evnl9Fg| zZ|B~TL=3=9Oo&CLy^Qi+$Bmrcik0|(f?eY>5uTeoi6wo6J%7#bSl z@#Dw1xVUia*fBafI(YQx5h*Dt+`fIA%*;#xVq#)=`0yb;Jw3dB{TdGs4_>}}iCiux zH8qv?_V!t8Mn^|a(mfr%zP?k=X`wjW<6UWeN)m(Q36Q6bhCt`_HNJ^75j&x!LX*lgTt|&EDQ#hv;4iPJI|+ zwOT1CC;-4>v5=piPi$-~v9Ynddi9EymKFfIy1IDw>>07KvD4Q2_3PKXdhg%ApAR2C zuzdM)0s;b9vt|v6iHYcRIvN`r2@ek^At3>ULP1$s8CI*6@$qru;^HVTFQ=iQ0f2Ac zzEN6QI%~~^FyA>%hf_`V^z@{rrUpMhKQ?UGKu=E(1qB5}L`0CAn@ebDDBHGeBQP+K zlP6DdjVS@kdu=$uRGDm$VjrYvk49kCO9}4rBX?BbTmmxNu;NzQ&m+(P*4!Q zzP?mcR1g>#NJd5mJ9q9RFE5XXhzPc9*}~?{n+XUAn6>77S;(B`j9RTeuF+`3Tp1l5 z6_u5hLI@$uX0xcOsgq^HNSN{WqQv~j%F03rkz80d*`8UJ(16S4X R^eg}X002ovPDHLkV1mleW!?Y) literal 1634 zcmV-o2A%ndP)R`00006VoOIv0RI60 z0RN!9r;`8x1{X<0K~#90?V4>!Q*9i^ud_@rMrayF%%BXGT8NZJlP#49t;`RxET|c? zP5aV2>&56}2J>T3p&>?+kDB!ICHrO^R_Nv^sntHLRj#(^u+a?Cx&5CH;mJ8S-;VBi z*7?DK?SKF8>%O*Y=j>)@fQX2Qh=_>DQou|t96x?s#xRT`9%e-54-uJKT3UuD*OI0- zF$|+%80Md)vn3)B)c`st7b3!);P&m?i|$5580zZkrmahs*oVjxB8Hp5h~XwMVz>#6 z7;XY1hMT}FI9$8kjsph{002B54|eU^#n%rWJh)K#IZ;_ziI*>5M$|7~zKrJPX2I9H zfB!zNUArc@u23vET)*EBlgR`CShj2#GBY#z`imDY7Aij{Se6CHaS`>Qp&>XN4#C&^ z^yw39Hk+WD4Gj%2o6Uk~33^%1$jCr@d%KX5e;v=BJ%h{T5=2YTaKC^5&R>=%7#J9U zR;$IKLx<4Q(*xl5C0nP{;nk~GIDGgpzJC1*tJR9y+FF#Cm!r0}7K4L>)Am+ZSL4Bh z2fRMVaVRS*gU{!iwa*_ve&FiWtJuGPKTe)Ji4Pw>@MF<@0D#-=#+fr`P*qh0qtS?9 zFgT;;bgwlU=g*(V`}gm0<;oRwc6LVXn=OKdJ32awzP>*GImdCRudjznr9weL0W=y7 zT3cJ;_xsV?+Y7y3kL>Jh{QC6^DwPUSsT5kR77W9ntgH-UV`CA$+1c5+bLS4fMpsuC z0)YThQ&Rx|mo8mGX=!QLG5PBu5C}k_P{84EK%>z>B9Wl5un-)_!Rz%#_3`uPPZSju z!Rd6Oy1E*6yB$WOaYoIl{!>y?qP~BpPMyNKb?Z=HUmtOj2!c+hJE+&|X||ZnW?Hjm z4G|Fy4-ZpPQW9SWKyTi>;d^h~xIvpXZHgFkxm?uJ(!%#~97hbpkkjdm=yf<8l$@MQ zKA(?>h?Ght-MV#)h=@{CQ^{a3P)A2c*ileWKo>7wBqE}=wl>Pj%A)b{aelq3sw!$~ zYKrOO=FOXwmzPJuV2~d#EiI)ZM~=kQobG*y#kOtR=;6bMv+A8duh)}Kr;FIVM!j($ z1Zin$$j!~=pYPnc6Q@s~1`%Q9%9Z@s+O=zunVE?bCr-d_x5MxEgNXQflY7^%Uym(Y zw&2N=Cs3(W7#JA9qeqYUUX@CPy?ghD`M7uQ9{>3D>(>|?8w)!#91aIEGBRTNu-R-- zDwU8({#@*ei;LlOI%8^wzH1OfppU%ngw;PrZuo}LbdVX$Jw3cl~| z-MhGO;R2eQn_)B>A(cvzl=R2iA{yTUr;mTw(w70ioo0MKYOFqur)ym>RSva-SRDQpoOePZ%5si+HQeR&mU$Wx7#Tc3PsGBU}R*3`uqFI z?RFCpk{w{PFbX0yfAjOITYfk1%FW;1y_o>|X{wxL>ZxbeW}^HF+wI&fg)NQd?;^9YRo=7B;&++yk gA|fIpBJ#KLFT^vkbb - + diff --git a/inherit_graph_5.md5 b/inherit_graph_5.md5 index 2f099a3..681cb27 100644 --- a/inherit_graph_5.md5 +++ b/inherit_graph_5.md5 @@ -1 +1 @@ -1ec3698da66039f1b94bf3c1c2083282 \ No newline at end of file +71d5d9938faaa29bdf632d4d804c4027 \ No newline at end of file diff --git a/inherit_graph_5.png b/inherit_graph_5.png index 583c267364e34dedcaeeff4240895835e1487456..923792dfc2444b16daf8f668dbdc516c7569f648 100644 GIT binary patch literal 1634 zcmV-o2A%ndP)R`00006VoOIv0RI60 z0RN!9r;`8x1{X<0K~#90?V4>!Q*9i^ud_@rMrayF%%BXGT8NZJlP#49t;`RxET|c? zP5aV2>&56}2J>T3p&>?+kDB!ICHrO^R_Nv^sntHLRj#(^u+a?Cx&5CH;mJ8S-;VBi z*7?DK?SKF8>%O*Y=j>)@fQX2Qh=_>DQou|t96x?s#xRT`9%e-54-uJKT3UuD*OI0- zF$|+%80Md)vn3)B)c`st7b3!);P&m?i|$5580zZkrmahs*oVjxB8Hp5h~XwMVz>#6 z7;XY1hMT}FI9$8kjsph{002B54|eU^#n%rWJh)K#IZ;_ziI*>5M$|7~zKrJPX2I9H zfB!zNUArc@u23vET)*EBlgR`CShj2#GBY#z`imDY7Aij{Se6CHaS`>Qp&>XN4#C&^ z^yw39Hk+WD4Gj%2o6Uk~33^%1$jCr@d%KX5e;v=BJ%h{T5=2YTaKC^5&R>=%7#J9U zR;$IKLx<4Q(*xl5C0nP{;nk~GIDGgpzJC1*tJR9y+FF#Cm!r0}7K4L>)Am+ZSL4Bh z2fRMVaVRS*gU{!iwa*_ve&FiWtJuGPKTe)Ji4Pw>@MF<@0D#-=#+fr`P*qh0qtS?9 zFgT;;bgwlU=g*(V`}gm0<;oRwc6LVXn=OKdJ32awzP>*GImdCRudjznr9weL0W=y7 zT3cJ;_xsV?+Y7y3kL>Jh{QC6^DwPUSsT5kR77W9ntgH-UV`CA$+1c5+bLS4fMpsuC z0)YThQ&Rx|mo8mGX=!QLG5PBu5C}k_P{84EK%>z>B9Wl5un-)_!Rz%#_3`uPPZSju z!Rd6Oy1E*6yB$WOaYoIl{!>y?qP~BpPMyNKb?Z=HUmtOj2!c+hJE+&|X||ZnW?Hjm z4G|Fy4-ZpPQW9SWKyTi>;d^h~xIvpXZHgFkxm?uJ(!%#~97hbpkkjdm=yf<8l$@MQ zKA(?>h?Ght-MV#)h=@{CQ^{a3P)A2c*ileWKo>7wBqE}=wl>Pj%A)b{aelq3sw!$~ zYKrOO=FOXwmzPJuV2~d#EiI)ZM~=kQobG*y#kOtR=;6bMv+A8duh)}Kr;FIVM!j($ z1Zin$$j!~=pYPnc6Q@s~1`%Q9%9Z@s+O=zunVE?bCr-d_x5MxEgNXQflY7^%Uym(Y zw&2N=Cs3(W7#JA9qeqYUUX@CPy?ghD`M7uQ9{>3D>(>|?8w)!#91aIEGBRTNu-R-- zDwU8({#@*ei;LlOI%8^wzH1OfppU%ngw;PrZuo}LbdVX$Jw3cl~| z-MhGO;R2eQn_)B>A(cvzl=R2iA{yTUr;mTw(w70ioo0MKYOFqur)ym>RSva-SRDQpoOePZ%5si+HQeR&mU$Wx7#Tc3PsGBU}R*3`uqFI z?RFCpk{w{PFbX0yfAjOITYfk1%FW;1y_o>|X{wxL>ZxbeW}^HF+wI&fg)NQd?;^9YRo=7B;&++yk gA|fIpBJ#KLFT^vkbbzN*U5>1w)~%|AKHrEuaV% zf4=i1y*O*_z1O==SI^n2rv+G8SXfwCSXfy8-{AacShsGSJBPy&_lFpkfdvueUAS=J zV@I3AkApZIj+n#Y{A)j1ECZNG0M|PjYznTOvuDr#aWyOhm-Xw{cWUR_SqIC19Jb(C z>N|Y+Fy_vk3!P5) zr{w)MQmGVk=gzfxoj!dUdc7XO!NCC9^6x6Y{-Vq8;RXUGlL`6x`Ca)leuDm_B{FmEF_R6N3f~f}5KgfVTYe^748e zZ_l1Rh=_=QNF?g@S_8V^eg%<8gp7;~tAfkT&4rtr8@_)1+K*qHn*a$U%z7i z{{2|AXc0DV-i-I}-~U$rwY9ZKN=kxMD#g~VTk+w;2di~nzI=(Os3=56Mna`hG4tx{ z>oITMJQ$6}Zr_i(x;o~T`XgQC&>cH=?7*8hZ?JdoUR=L^{iox9Mz0IbWHKQ&H5Hke znNTPc(ChUG3=Bkaax#`LUks+~Vg*hRgriS79(15EvK;9*>8(xHxb)9L$?H4`#C&O-)Vk_xH!=&z}(;9gX+z-y=9U7#54g zO6U3W=W+1hK^!=608UO$j9n}iqoJVzuU@?Z01y#w-nF%a<>w%F0U8YPICloxc<^8{8jVCm6c7+VDJdz8?xdt7x_0dv^HQl)L`3xQ<41CEaA3~qm@#9B zh`P<;XNW{1x^?T;Psepcp-@nKe7sG^)+c+o(W6Jh-Q67k;Ns!}9*+l4PfzB!o$&B* z%%49WlP6Ecj2SZ!6cl9jkk{GS8Q$LB%yCdq5E2s;F?Q@&xVgDu!-fse>2xreOduiv zKyh&~{QdozIZjSaxO(*}06?$Tqq@2pCr_S)lamvkJb8jCQ>NJHm&s&ENJzk;Lx-SJ zsjRMU08ms^1hd&}^$9O8FUQD{BQa;roL|nrw6qknX3er%TPzl%w6qlA;o%rIY#8`_ zJ^*0yfFOM0$EU(>*GcN`!=j zproV(0MOXjh^D3{3>h*6K-=ET+1VMXsj1kxb0^N9Kab?(Wbk-AI5@OPcXoD0O-+qe zoQDq|LLd+TXe+=64<6v|-MiSaV+SM>2}X<^vS1)z#I%oWF~U3*NkWV`VcMjTkAa=9EgZrs49PoEGL76w;W z*I$nHBi-d-Pwe_VTykP*+Dal3`m&-*&LgvSS-fQojV~E3Ly{(5D*Z6W53wou{j(L zQc_ZomX?Ox+*})NGMNl_?%c7todRuFz{JEv`1tt1$Hxcm?(Uc~XAb0Yd5`j+HER}j z@7@iONCcr!2tJ>Wl`B_b$&w|Vj{oPMe=v3GROt13golUsC{|zQ;N|6oq@<)i=~8Xz zY13dbnJ6zWk2!8^Y-Ab%BBG|ICd$dlVU8^p3%!2*nlu^>84L!--f@Hb?%g{oEiEOB z#lrZ%efvfljfSeLtBHunXf)FE=g%3x!C)YbMnko=wN~2l^Yg9rzIgG1%F4=!h)Atg z)0Zz_h={1ArG;{Ga+rpOi0JX-$7C{@m}8^SNE(fXs;a7fJO6gA1qB6ES6A2NI_<>8 z#nJlp>#b~RwVLYd>utui$9weXQI~6Wmc!3zZf+*6R!e%l{+H);)im_F;QES=1;^5c z(P*R*BSw%~t?q9rJ?4*gseQqaAww`}(xm>D@z-$a(j{!)z8zs~C{51t95D2<`?)hIMHZ~Tqv9W(V&Wsr|Y@W3INe1+ - + diff --git a/inherit_graph_6.md5 b/inherit_graph_6.md5 index 28a70e6..2f099a3 100644 --- a/inherit_graph_6.md5 +++ b/inherit_graph_6.md5 @@ -1 +1 @@ -446ce203cf8e22808d09a08c2ee14f22 \ No newline at end of file +1ec3698da66039f1b94bf3c1c2083282 \ No newline at end of file diff --git a/inherit_graph_6.png b/inherit_graph_6.png index 7ab3216b51321f92b3044ad5c0f19c55f72edb81..583c267364e34dedcaeeff4240895835e1487456 100644 GIT binary patch literal 2454 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 - + diff --git a/inherit_graph_7.md5 b/inherit_graph_7.md5 index 92576f9..28a70e6 100644 --- a/inherit_graph_7.md5 +++ b/inherit_graph_7.md5 @@ -1 +1 @@ -76c05c00d44d35caeff1058e7db50b58 \ No newline at end of file +446ce203cf8e22808d09a08c2ee14f22 \ No newline at end of file diff --git a/inherit_graph_7.png b/inherit_graph_7.png index 12603b8cd5d0cc88f629a0f6aaa3f460110a3298..7ab3216b51321f92b3044ad5c0f19c55f72edb81 100644 GIT binary patch literal 2653 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

b@SW{T3kwUTsGL#; zL!z{_G^_U`@u@#d5V~(}ZVmz=kw|Y~$qzGSKz_1b^tr$t$v-xUrGOxRb zM}K7UjT=Z6l^4|~-Sn3ujeLE5!}ulBx`?d_m?ux3^u7E%Gjp}A%@kmcL?XFxr6Rk# zyMPGxHRFJ1uhI`5YgDqfvf_q#7JEK6$6~o4MERVGxE~Q4GuR{UjYA8YoZlA*K8%n1 zIhc5bfWCAScjNT*^c1zUgn}3{5lvG;eY=~V09(Iao@$9jA3uJ)jx=e&tnKN`vZ|=@ zJ9?0v>R6=$85hdU3H&HxL1bV*!-ztHGJ#nwpxCzrXouJvdXNdd<`n27{HKRu3F0x5VQkf3CRPHICML zoNz&gG(Kj0FEv#_YoO`kr+|rC7k{6Ys8yLJCetZ88vVuqg}P~1WJG8P{eY5^lG@&w z-3N#3>*)=RR-U4yT#jF#Zc*mtad)Nz)9~c<8O{Lnf*=!VoPPE|_lB=sO)<%CC zELKAx5JzP)sEM;3H^dQ$LD{E!9GA|)!OXR(CLgCsPv4^lEh|RGcfPdGb*7qhT;~^? zSz8+*Wy+$3AV6{=A|hu;40Lov)N=)_^R>F}==#j8uJ->%*-=vtJ3W9vs6|CcQHqYw zOTiFkeou~CXMaCzvLQ6tm3Gsvav!{4IRbQJ_~RF$)V`#=e1AqpMl)!AKg7KhFT^78yr-_xz)J$ABaQIF(#ir?ZBAUSXZ@ z`u#`OyJol7&f0*6#Am?;6isDi@}I&}0QJ-A5;z=AQG9p3L-o)hz(`oLuGA6Y*{E8M z){3KIXRS_g;Bs<( z$s@5ri5oN5Tsj7+hWpIT&25TL6gkglZmdqCmwv>g%NdHcC2I2&QK^a|d^RsXFD<12 z0?U~sOqI6+DLiy2%PJ_~FS1JpNX);^)ksN6X#?hTIX<3lu>L<0A4}j|KJDyW_&xB# zg{Lx3Wy75B^rOUtWslnKZi^{qw6MOuKIH1+qQ9@dztYj85%%HWr2cXnPat4bM3HK0 zyeG@x7z_rr3ecbfKTtuT=GafqQ!&SmiAAqZcReFbu2c^P=*=zkfczr2Ulmic6O>j{ zQsO>!?|6F(TzTf>M;>QqXS}(&S*iVBE18^>EjyWk!{hfytxfSWTr<``v~F&1f2&!1 zFS!%flx?BX-QQ2Ra>Wo*LZ@dlv29YD=a<&jp7jz}BcOD=sVT(K(QyX&%JOLC{OV*w zR*x@{?#*LmZJlTog2Qo3YI_QLd3nYC{`S{1r>CdiHij$P6`vrD{9GC?3kwS~wXqQd zDof!5tpx@K@(Bq+A)#J{|+Wm6MmJ2aclBSS(KUl?K9IU%@fW#RnxN zkYpiw9QgO+7>t9LmoS|etnVL+WvAxnOMz@Srzb;?VX&WghjEsaJSs;W&Ydfz(3+d6 zZWf|&27}>XX~`eI{k_M#b$1dt@VsOR9v{tH(Dm+w1h%){ro{ySsg!E}h=q_Wv>CPb(3O82&s;;sS-SF) - + diff --git a/inherit_graph_8.md5 b/inherit_graph_8.md5 index ef477fe..92576f9 100644 --- a/inherit_graph_8.md5 +++ b/inherit_graph_8.md5 @@ -1 +1 @@ -891351f6f10fa03803f396980d7db034 \ No newline at end of file +76c05c00d44d35caeff1058e7db50b58 \ No newline at end of file diff --git a/inherit_graph_8.png b/inherit_graph_8.png index ede09f34119a71bc968837fb627c7e89c7693349..12603b8cd5d0cc88f629a0f6aaa3f460110a3298 100644 GIT binary patch literal 2481 zcmYLL2{cr18z0J8G8lWdF_uweE6hO?GiI{O(wDK9Eo5wovX-eBOZW@P2q9UfOqtLy zwiMadnn<=p*-DEv_`jX=edjy(-20q+&w1Z-pZB*t6ni^!n1GA`1OkCsTHqZ)?FP3B z9~388K!jl#E+rz8SZ0{uaYOg55+5F?HE1f794hi|Ge@DVXTT0uL^D#&| z-Q>oL7caP0J3iEs+qazC1+KTxT$A7eVHZSC~D ze%(R$d9|YO#*=f2=lKP9SI^C|P~j60z@0n^O(K)O?)>?MJRRh9 z6DA8qqZ_cV91e*O1u^`8R#&T!jgP~O5)$v;y<6f~wIZ`QRB8s6M^S#fk+4Xdo1aH! zTWoC1nytL0?~DDpf=x&`G2MKHT;u#$h;f`bJ2#gkiw+TFq?;shIC1s$^>0-tN)F&@ zXUx=dm9({m>2!Jug@TQWGWfK&^;P+woE*5kd}>z7K>#NSWj>Yom^Q7u61t`z3}D{AtYq&s!#mhF2=~nsIiyj!Hg

b@SW{T3kwUTsGL#; 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 diff --git a/inherit_graph_9.map b/inherit_graph_9.map index 6fff3e9..93bb25f 100644 --- a/inherit_graph_9.map +++ b/inherit_graph_9.map @@ -1,3 +1,3 @@ - + diff --git a/inherit_graph_9.md5 b/inherit_graph_9.md5 index eedbee2..ef477fe 100644 --- a/inherit_graph_9.md5 +++ b/inherit_graph_9.md5 @@ -1 +1 @@ -28f10d573ab1dc424e0571f9bee132d9 \ No newline at end of file +891351f6f10fa03803f396980d7db034 \ No newline at end of file diff --git a/inherit_graph_9.png b/inherit_graph_9.png index 5f57f071b61ecd3f686d4e4afd6a977718839ee4..ede09f34119a71bc968837fb627c7e89c7693349 100644 GIT binary patch delta 1713 zcmV;i22S~i5Yi2hHGc+&Nkl!c6YsI+y^fw}0gt(uWu zo4g`|B&fab?%&1+*Y({0>w}Aj8+ZU13lDMHv|pB9FHGAUh!-gt502B-J*8ED(AuYLt%r! z0Kf);@e4Kx3;=8p7{6eHzyRHO!I-@j;y$sml6 zk3+3iqpYk9SFT*a(9jToe@@3Ll?qy|7AH=eKvh*0I)6Jm0RY#oUBlquAa32dg%>Yg zU}9n-;H_aP&91I4R8&-;yu2J*t=7NJWHOiEE5KG% zR77{~+#!R(Kme$}zu)hB@ZbSuWMmK#kxV9|SFc_X5z)7A-zY9FE@I80p&`FdB9V|* ztA8cC-A=8ot$w@H=_HQh$Y!&V!C;^rJ9hYeNl8hhR;x*?)dt+8QYqcIaf676o;-O% zB9Vw@W@h~B%FD~?{{8!5V?BKMkR%cb`FuXVzo4Lis;jHRYR=X6;lqcBdOyE^ky2Y* zODdJ>)WYXIJ{`T5wiX%oa^ambukil_%6DJcnqgMWho zHn-c2&6_s^0Dk`biK(e6#K*@209-B?5)%`_aY2_tM69`f{rW}MJ$?EV*RNkkOG^th z8V!U(A>!heUt&T+0u%}b?%ur{U>6F7VPkFGx)mQkehgUSa=Dh&bT}N?xN+mM^Noh6 z_Xx$s#d!VtH9md%1OONw9>(+M&wo)|Tnqs4`Fyx{?;Zfa>-D0!x!LanfSH+@-_{I; z*=$BmP7X>-OCb~r(b3TXpU;Qc+1X{)R#a4kw{PEK!-fq=OH0G{?b}gSRtB9;7dBQ& zNeMbTJ7F@J003XVe)Vr?!)Y#u#rn4#q8x_=tSj~@r{ z&uP22w->3Yso1q^7e+=#{DYB}mIk$29klCRN;4Enr4o9*9_i`n5Q#+S>gs}6EXLWh zXO~r5Zf-8>>+6x3nTgEIOzhsh8~OS9sHmt28|%P<188h)gj_C%L?XeyefyA>mbRqk z?-HtiG2wSNi*vYKF6!;=rGJTu3BPUr2JQ3b&&2b5zy@l1dYTLd1C5T3($v%xb$53! zsp;`}NUzri9A`3_Xl!hZh=_jt_(45AJ>+mWh=|DTc9Y3u3RB#AH2GubzFhEwT zHNfU}yQ!zAhwOHHfIU>KIh;->>2x~k>+7Sju`%L#KCI?qwS{AT|9>JS)Mhd0jasEr zo#Hs|uUK56WHcI4T3Q1cKqU&Vj*TFc=KRe}lgPyo#s=5qf9H00000NkvXX Hu0mjf9zR%C delta 2025 zcmVUcruVqsX~gCI&u_0U7122p86L6k2^kd_sVW1@M<5l2xc(@Dl0FF87{ z|ATpGyjxy={W+hvv-e(WefQdnbM~Hd2H@b};Nalk;Ft?DyMG}uG0}}-n2?PS!?8XP z(YxZ};+|jIY-SH)7$$^an1|~pi(>=$7r>)m8|DrZlW^1SW5b=JZ0 zAB8If4gg#saQuWT1P%aPA#nVJD+CSziyR;S%P15I3=aS{V zWsSXj`7$&b&8llyO}~HT9RUDBLqj2#%h~IrM~@;nI2dtpaoD$S-Tz9VS0TBuYiJb3T`M~)mpY=3Mlo;`cU_Seeq&!VfVYu*^Wy}b+0cRs&= z!XFoc$z;O4d-vF+i^XCnl}ePAmBDBkdLSbBOo0APH496>=r=rFOXlFrnKN*AcSlM}3ZzmgMn*;u5D);pUXQrAIGD|5h{a+U42C%|92^`Loa=1A ztACD4r8<_Bltjx#qtOrms;{qS+iu*rL4JOIq}S`IxVV^Y9~c-QhGD3)vy)0nN=Pgg zvwaqeg}l7HC@U+A?%cUUJ9qA+$;nB!KPD!I3JVK~h{)O5naaz{=V-Zf=@LanMJ;Oo zTZ=FJ--qB)vIMt?@=`0?Y^-QCU3v#F_xh=_W6ddSAcX2~27 z5d{PU(9@?+iHPXt&6~7;|9&goGMS8Wa&qRxSc+f$E|;XFBvPqV$7Zkls_YR20s;K| z{MhTTurQ>jr(?&C9dL1RL27C$v|24pCKHGV0MOXjh~VI0)`rL9vCq1Oh6b3;W`C2Mn^|6K0XdRJ39c= z&sl*$fV+3^;^M`NC@LyKK|ulde1AS{Y^FnQ-n}x0+~#Prluwc1OoK;_gmS# zdi4q-kqE$aVXQO<3}gMthqJRYT3cJK+6D&)v1QAaC1b25t8#p_SS+}5<$nr*=>^Hp z&qqW=1R5F|AdyHA9UTompO43nAH!m?U}|a#k&%%oFE2-1TN?nNxw)A=lgnf>yng)} z|NQe0yuH1#efxGO6be*VSI--NY-|jvsj0BFwS`itT-3gxpa4ETKCrj9hfF3zT3Q;k zS}n%L#t;z^f#=VkqrJTy0Dn+ZQ-kpEaEy+Q{&o&#n4Fvh05-o`gan`TF{jo0}UYCMJ@Pj}L{0 zh7u7`PEHOvIy#cSzdr>91(94Xr@Xv8A|lGo%_V_AKz@FH`TF{j zot+)KFVSc;;lqb)3@0Zi^7r>AKA%tN>FM*vSc=(x zm%~DPgjFeo8S(Ay?SItL(!wqn5z+AQFsapQ`ug=N5fKdz4pLoR9ew})ojN-^sjsh( z8X6kNVzE#}L)I7&SFD z^zGZX1!FA5e14Z=T?%0(eE9Hz1OfqDAX=@K93360ySsbEzBZcQ&A~>nW~T-_J3DxI zc&yk?B9S05F%f(B?uDnPC%U@2aP{g{xVgFgsibx1cXO~9wY9a#&(B}5KQJ&585tR? z7H`g1%qo@Y7-GXP54mp^|367iP6iSETU1nJ^>gH3`O=AF_2CME0{~YD96#ay*T4Z_ zoP|Q;%zFYd1m<$2!2{@wzu!0|y5O2L}ho-@*R?n^v5~HJ8>^00000NkvXX Hu0mjfL` diff --git a/inherits.html b/inherits.html index 72bffa0..8ea1aa9 100644 --- a/inherits.html +++ b/inherits.html @@ -78,74 +78,79 @@

Go to the textual class hierarchy

- + - - - - - - - - - - - - -
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/search/all_0.js b/search/all_0.js index 8df5733..5ac2d64 100644 --- a/search/all_0.js +++ b/search/all_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['basiccompression_5ft_0',['basicCompression_t',['../d3/d5a/structbasicCompression__t.html',1,'']]] + ['allocinfo_0',['AllocInfo',['../de/de7/structAllocInfo.html',1,'']]] ]; diff --git a/search/all_1.js b/search/all_1.js index 3d77094..8df5733 100644 --- a/search/all_1.js +++ b/search/all_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['fileformatinfo_5ft_0',['fileFormatInfo_t',['../d2/dad/structfileFormatInfo__t.html',1,'']]] + ['basiccompression_5ft_0',['basicCompression_t',['../d3/d5a/structbasicCompression__t.html',1,'']]] ]; diff --git a/search/all_2.js b/search/all_2.js index 83a80dd..3d77094 100644 --- a/search/all_2.js +++ b/search/all_2.js @@ -1,5 +1,4 @@ var searchData= [ - ['getlibraries_0',['GetLibraries',['../d8/dc6/classXexLoader.html#ad343ed531e6bcef90576191948cfa7ce',1,'XexLoader']]], - ['getpath_1',['GetPath',['../d8/dc6/classXexLoader.html#ab0349b866107f199f21a1894363a80c8',1,'XexLoader']]] + ['fileformatinfo_5ft_0',['fileFormatInfo_t',['../d2/dad/structfileFormatInfo__t.html',1,'']]] ]; diff --git a/search/all_3.js b/search/all_3.js index 7ddeb7e..83a80dd 100644 --- a/search/all_3.js +++ b/search/all_3.js @@ -1,4 +1,5 @@ var searchData= [ - ['importheader_5ft_0',['importHeader_t',['../dc/d78/structimportHeader__t.html',1,'']]] + ['getlibraries_0',['GetLibraries',['../d8/dc6/classXexLoader.html#ad343ed531e6bcef90576191948cfa7ce',1,'XexLoader']]], + ['getpath_1',['GetPath',['../d8/dc6/classXexLoader.html#ab0349b866107f199f21a1894363a80c8',1,'XexLoader']]] ]; diff --git a/search/all_4.js b/search/all_4.js index d702224..7ddeb7e 100644 --- a/search/all_4.js +++ b/search/all_4.js @@ -1,4 +1,4 @@ var searchData= [ - ['libraryheader_5ft_0',['libraryHeader_t',['../dc/d90/structlibraryHeader__t.html',1,'']]] + ['importheader_5ft_0',['importHeader_t',['../dc/d78/structimportHeader__t.html',1,'']]] ]; diff --git a/search/all_5.js b/search/all_5.js index 1f6b1e3..d702224 100644 --- a/search/all_5.js +++ b/search/all_5.js @@ -1,4 +1,4 @@ var searchData= [ - ['mspackmemoryfile_5ft_0',['mspackMemoryFile_t',['../d7/d68/structmspackMemoryFile__t.html',1,'']]] + ['libraryheader_5ft_0',['libraryHeader_t',['../dc/d90/structlibraryHeader__t.html',1,'']]] ]; diff --git a/search/all_6.js b/search/all_6.js index c329fe6..1f6b1e3 100644 --- a/search/all_6.js +++ b/search/all_6.js @@ -1,5 +1,4 @@ var searchData= [ - ['normalcompressionblock_5ft_0',['normalCompressionBlock_t',['../db/dd1/structnormalCompressionBlock__t.html',1,'']]], - ['normalcompressionheader_5ft_1',['normalCompressionHeader_t',['../db/dad/structnormalCompressionHeader__t.html',1,'']]] + ['mspackmemoryfile_5ft_0',['mspackMemoryFile_t',['../d7/d68/structmspackMemoryFile__t.html',1,'']]] ]; diff --git a/search/all_7.js b/search/all_7.js index 3ac71d7..c329fe6 100644 --- a/search/all_7.js +++ b/search/all_7.js @@ -1,4 +1,5 @@ var searchData= [ - ['optionalheader_5ft_0',['optionalHeader_t',['../db/da1/structoptionalHeader__t.html',1,'']]] + ['normalcompressionblock_5ft_0',['normalCompressionBlock_t',['../db/dd1/structnormalCompressionBlock__t.html',1,'']]], + ['normalcompressionheader_5ft_1',['normalCompressionHeader_t',['../db/dad/structnormalCompressionHeader__t.html',1,'']]] ]; diff --git a/search/all_8.js b/search/all_8.js index 4200aff..3ac71d7 100644 --- a/search/all_8.js +++ b/search/all_8.js @@ -1,4 +1,4 @@ var searchData= [ - ['pagedescriptor_5ft_0',['pageDescriptor_t',['../df/dc0/structpageDescriptor__t.html',1,'']]] + ['optionalheader_5ft_0',['optionalHeader_t',['../db/da1/structoptionalHeader__t.html',1,'']]] ]; diff --git a/search/all_9.js b/search/all_9.js index 027f91a..4200aff 100644 --- a/search/all_9.js +++ b/search/all_9.js @@ -1,4 +1,4 @@ var searchData= [ - ['uint128_5ft_0',['uint128_t',['../d0/dde/unionuint128__t.html',1,'']]] + ['pagedescriptor_5ft_0',['pageDescriptor_t',['../df/dc0/structpageDescriptor__t.html',1,'']]] ]; diff --git a/search/all_a.js b/search/all_a.js index db42a3a..027f91a 100644 --- a/search/all_a.js +++ b/search/all_a.js @@ -1,7 +1,4 @@ var searchData= [ - ['xexexport_5ft_0',['xexExport_t',['../d6/d3a/structxexExport__t.html',1,'']]], - ['xexheader_5ft_1',['xexHeader_t',['../d1/d78/structxexHeader__t.html',1,'']]], - ['xexlibrary_5ft_2',['xexLibrary_t',['../db/d39/structxexLibrary__t.html',1,'']]], - ['xexloader_3',['XexLoader',['../d8/dc6/classXexLoader.html',1,'XexLoader'],['../d8/dc6/classXexLoader.html#a99a9b96670b5166c03919bcab19d9da4',1,'XexLoader::XexLoader()']]] + ['uint128_5ft_0',['uint128_t',['../d0/dde/unionuint128__t.html',1,'']]] ]; diff --git a/search/all_b.js b/search/all_b.js new file mode 100644 index 0000000..db42a3a --- /dev/null +++ b/search/all_b.js @@ -0,0 +1,7 @@ +var searchData= +[ + ['xexexport_5ft_0',['xexExport_t',['../d6/d3a/structxexExport__t.html',1,'']]], + ['xexheader_5ft_1',['xexHeader_t',['../d1/d78/structxexHeader__t.html',1,'']]], + ['xexlibrary_5ft_2',['xexLibrary_t',['../db/d39/structxexLibrary__t.html',1,'']]], + ['xexloader_3',['XexLoader',['../d8/dc6/classXexLoader.html',1,'XexLoader'],['../d8/dc6/classXexLoader.html#a99a9b96670b5166c03919bcab19d9da4',1,'XexLoader::XexLoader()']]] +]; diff --git a/search/classes_0.js b/search/classes_0.js index 8df5733..5ac2d64 100644 --- a/search/classes_0.js +++ b/search/classes_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['basiccompression_5ft_0',['basicCompression_t',['../d3/d5a/structbasicCompression__t.html',1,'']]] + ['allocinfo_0',['AllocInfo',['../de/de7/structAllocInfo.html',1,'']]] ]; diff --git a/search/classes_1.js b/search/classes_1.js index 3d77094..8df5733 100644 --- a/search/classes_1.js +++ b/search/classes_1.js @@ -1,4 +1,4 @@ var searchData= [ - ['fileformatinfo_5ft_0',['fileFormatInfo_t',['../d2/dad/structfileFormatInfo__t.html',1,'']]] + ['basiccompression_5ft_0',['basicCompression_t',['../d3/d5a/structbasicCompression__t.html',1,'']]] ]; diff --git a/search/classes_2.js b/search/classes_2.js index 7ddeb7e..3d77094 100644 --- a/search/classes_2.js +++ b/search/classes_2.js @@ -1,4 +1,4 @@ var searchData= [ - ['importheader_5ft_0',['importHeader_t',['../dc/d78/structimportHeader__t.html',1,'']]] + ['fileformatinfo_5ft_0',['fileFormatInfo_t',['../d2/dad/structfileFormatInfo__t.html',1,'']]] ]; diff --git a/search/classes_3.js b/search/classes_3.js index d702224..7ddeb7e 100644 --- a/search/classes_3.js +++ b/search/classes_3.js @@ -1,4 +1,4 @@ var searchData= [ - ['libraryheader_5ft_0',['libraryHeader_t',['../dc/d90/structlibraryHeader__t.html',1,'']]] + ['importheader_5ft_0',['importHeader_t',['../dc/d78/structimportHeader__t.html',1,'']]] ]; diff --git a/search/classes_4.js b/search/classes_4.js index 1f6b1e3..d702224 100644 --- a/search/classes_4.js +++ b/search/classes_4.js @@ -1,4 +1,4 @@ var searchData= [ - ['mspackmemoryfile_5ft_0',['mspackMemoryFile_t',['../d7/d68/structmspackMemoryFile__t.html',1,'']]] + ['libraryheader_5ft_0',['libraryHeader_t',['../dc/d90/structlibraryHeader__t.html',1,'']]] ]; diff --git a/search/classes_5.js b/search/classes_5.js index c329fe6..1f6b1e3 100644 --- a/search/classes_5.js +++ b/search/classes_5.js @@ -1,5 +1,4 @@ var searchData= [ - ['normalcompressionblock_5ft_0',['normalCompressionBlock_t',['../db/dd1/structnormalCompressionBlock__t.html',1,'']]], - ['normalcompressionheader_5ft_1',['normalCompressionHeader_t',['../db/dad/structnormalCompressionHeader__t.html',1,'']]] + ['mspackmemoryfile_5ft_0',['mspackMemoryFile_t',['../d7/d68/structmspackMemoryFile__t.html',1,'']]] ]; diff --git a/search/classes_6.js b/search/classes_6.js index 3ac71d7..c329fe6 100644 --- a/search/classes_6.js +++ b/search/classes_6.js @@ -1,4 +1,5 @@ var searchData= [ - ['optionalheader_5ft_0',['optionalHeader_t',['../db/da1/structoptionalHeader__t.html',1,'']]] + ['normalcompressionblock_5ft_0',['normalCompressionBlock_t',['../db/dd1/structnormalCompressionBlock__t.html',1,'']]], + ['normalcompressionheader_5ft_1',['normalCompressionHeader_t',['../db/dad/structnormalCompressionHeader__t.html',1,'']]] ]; diff --git a/search/classes_7.js b/search/classes_7.js index 4200aff..3ac71d7 100644 --- a/search/classes_7.js +++ b/search/classes_7.js @@ -1,4 +1,4 @@ var searchData= [ - ['pagedescriptor_5ft_0',['pageDescriptor_t',['../df/dc0/structpageDescriptor__t.html',1,'']]] + ['optionalheader_5ft_0',['optionalHeader_t',['../db/da1/structoptionalHeader__t.html',1,'']]] ]; diff --git a/search/classes_8.js b/search/classes_8.js index 027f91a..4200aff 100644 --- a/search/classes_8.js +++ b/search/classes_8.js @@ -1,4 +1,4 @@ var searchData= [ - ['uint128_5ft_0',['uint128_t',['../d0/dde/unionuint128__t.html',1,'']]] + ['pagedescriptor_5ft_0',['pageDescriptor_t',['../df/dc0/structpageDescriptor__t.html',1,'']]] ]; diff --git a/search/classes_9.js b/search/classes_9.js index b9d582b..027f91a 100644 --- a/search/classes_9.js +++ b/search/classes_9.js @@ -1,7 +1,4 @@ var searchData= [ - ['xexexport_5ft_0',['xexExport_t',['../d6/d3a/structxexExport__t.html',1,'']]], - ['xexheader_5ft_1',['xexHeader_t',['../d1/d78/structxexHeader__t.html',1,'']]], - ['xexlibrary_5ft_2',['xexLibrary_t',['../db/d39/structxexLibrary__t.html',1,'']]], - ['xexloader_3',['XexLoader',['../d8/dc6/classXexLoader.html',1,'']]] + ['uint128_5ft_0',['uint128_t',['../d0/dde/unionuint128__t.html',1,'']]] ]; diff --git a/search/classes_a.js b/search/classes_a.js new file mode 100644 index 0000000..b9d582b --- /dev/null +++ b/search/classes_a.js @@ -0,0 +1,7 @@ +var searchData= +[ + ['xexexport_5ft_0',['xexExport_t',['../d6/d3a/structxexExport__t.html',1,'']]], + ['xexheader_5ft_1',['xexHeader_t',['../d1/d78/structxexHeader__t.html',1,'']]], + ['xexlibrary_5ft_2',['xexLibrary_t',['../db/d39/structxexLibrary__t.html',1,'']]], + ['xexloader_3',['XexLoader',['../d8/dc6/classXexLoader.html',1,'']]] +]; diff --git a/search/searchdata.js b/search/searchdata.js index cf9a004..4fa9872 100644 --- a/search/searchdata.js +++ b/search/searchdata.js @@ -1,7 +1,7 @@ var indexSectionsWithContent = { - 0: "bfgilmnopux", - 1: "bfilmnopux", + 0: "abfgilmnopux", + 1: "abfilmnopux", 2: "gx" };