Changeset 105813 in vbox for trunk/src/bldprogs
- Timestamp:
- Aug 22, 2024 11:38:31 AM (3 months ago)
- File:
-
- 1 edited
-
trunk/src/bldprogs/VBoxDef2LazyLoad.cpp (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/bldprogs/VBoxDef2LazyLoad.cpp
r104213 r105813 1230 1230 "___LazyLoad___%s:\n" 1231 1231 " adrp x9, PAGE(g_sz%s)\n" 1232 "#ifndef ASM_FORMAT_ELF\n"1233 1232 " add x9, x9, PAGEOFF(g_sz%s)\n" 1234 "#else\n"1235 " ldr x9, [x9, PAGEOFF(g_sz%s)]\n"1236 "#endif\n"1237 1233 " adrp x10, PAGE(NAME(%s%s))\n" 1238 "#ifndef ASM_FORMAT_ELF\n"1239 1234 " add x10, x10, PAGEOFF(NAME(%s%s))\n" 1240 "#else\n"1241 " ldr x10, [x10, PAGEOFF(NAME(%s%s))]\n"1242 "#endif\n"1243 1235 " mov x16, x30\n" 1244 1236 " bl LazyLoadResolver\n" 1245 1237 " mov x30, x16\n" 1246 1238 , pExp->pszExportedNm, 1247 pExp->pszExportedNm, pExp->pszExportedNm, pExp->pszExportedNm, 1248 !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm, 1239 pExp->pszExportedNm, pExp->pszExportedNm, 1249 1240 !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm, 1250 1241 !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm); … … 1254 1245 " movk w9, #%u\n" 1255 1246 " adrp x10, PAGE(NAME(%s%s))\n" 1256 "#ifndef ASM_FORMAT_ELF\n"1257 1247 " add x10, x10, PAGEOFF(NAME(%s%s))\n" 1258 "#else\n"1259 " ldr x10, [x10, PAGEOFF(NAME(%s%s))]\n"1260 "#endif\n"1261 1248 , pExp->pszExportedNm, 1262 1249 pExp->uOrdinal, 1263 !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm,1264 1250 !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm, 1265 1251 !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm); … … 1358 1344 " mov x3, x0\n" 1359 1345 " adrp x2, PAGE(g_szLibrary)\n" 1360 "#ifndef ASM_FORMAT_ELF\n"1361 1346 " add x2, x2, PAGEOFF(g_szLibrary)\n" 1362 "#else\n"1363 " ldr x2, [x2, PAGEOFF(g_szLibrary)]\n"1364 "#endif\n"1365 1347 " mov x1, x19\n" 1366 1348 " adrp x0, PAGE(g_szFailLoadFmt)\n" 1367 "#ifndef ASM_FORMAT_ELF\n"1368 1349 " add x0, x0, PAGEOFF(g_szFailLoadFmt)\n" 1369 "#else\n"1370 " ldr x0, [x0, PAGEOFF(g_szFailLoadFmt)]\n"1371 "#endif\n"1372 1350 " stp x1, x2, [sp]\n" 1373 1351 " str x3, [sp, #16]\n" … … 1437 1415 " mov x2, #0\n" 1438 1416 " adrp x1, PAGE(g_hMod)\n" 1439 "#ifndef ASM_FORMAT_ELF\n"1440 1417 " add x1, x1, PAGEOFF(g_hMod)\n" 1441 "#else\n"1442 " ldr x1, [x1, PAGEOFF(g_hMod)]\n"1443 "#endif\n"1444 1418 " adrp x0, PAGE(g_szLibrary)\n" 1445 "#ifndef ASM_FORMAT_ELF\n"1446 1419 " add x0, x0, PAGEOFF(g_szLibrary)\n" 1447 "#else\n"1448 " ldr x0, [x0, PAGEOFF(g_szLibrary)]\n"1449 "#endif\n"1450 1420 " bl NAME(SUPR3HardenedLdrLoadAppPriv)\n"); 1451 1421 else … … 1453 1423 " /* Call RTLdrLoadSystem(const char *pszFilename, bool fNoUnload, PRTLDRMOD phLdrMod); */\n" 1454 1424 " adrp x2, PAGE(g_hMod)\n" 1455 "#ifndef ASM_FORMAT_ELF\n"1456 1425 " add x2, x2, PAGEOFF(g_hMod)\n" 1457 "#else\n"1458 " ldr x2, [x2, PAGEOFF(g_hMod)]\n"1459 "#endif\n"1460 1426 " mov x1, #1\n" 1461 1427 " adrp x0, PAGE(g_szLibrary)\n" 1462 "#ifndef ASM_FORMAT_ELF\n"1463 1428 " add x0, x0, PAGEOFF(g_szLibrary)\n" 1464 "#else\n"1465 " ldr x0, [x0, PAGEOFF(g_szLibrary)]\n"1466 "#endif\n"1467 1429 " bl NAME(RTLdrLoadSystem)\n"); 1468 1430 … … 1474 1436 " mov x2, x0\n" 1475 1437 " adrp x1, PAGE(g_szLibrary)\n" 1476 "#ifndef ASM_FORMAT_ELF\n"1477 1438 " add x1, x1, PAGEOFF(g_szLibrary)\n" 1478 "#else\n"1479 " ldr x1, [x1, PAGEOFF(g_szLibrary)]\n"1480 "#endif\n"1481 1439 " adrp x0, PAGE(g_szFailResolveFmt)\n" 1482 "#ifndef ASM_FORMAT_ELF\n"1483 1440 " add x0, x0, PAGEOFF(g_szFailResolveFmt)\n" 1484 "#else\n"1485 " ldr x0, [x0, PAGEOFF(g_szFailResolveFmt)]\n"1486 "#endif\n"1487 1441 " stp x1, x2, [sp]\n" 1488 1442 " bl NAME(RTAssertMsg2Weak)\n" … … 1558 1512 " mov x2, #0\n" 1559 1513 " adrp x1, PAGE(g_hMod)\n" 1560 "#ifndef ASM_FORMAT_ELF\n"1561 1514 " add x1, x1, PAGEOFF(g_hMod)\n" 1562 "#else\n"1563 " ldr x1, [x1, PAGEOFF(g_hMod)]\n"1564 "#endif\n"1565 1515 " adrp x0, PAGE(g_szLibrary)\n" 1566 "#ifndef ASM_FORMAT_ELF\n"1567 1516 " add x0, x0, PAGEOFF(g_szLibrary)\n" 1568 "#else\n"1569 " ldr x0, [x0, PAGEOFF(g_szLibrary)]\n"1570 "#endif\n"1571 1517 " bl NAME(SUPR3HardenedLdrLoadAppPriv)\n"); 1572 1518 else … … 1574 1520 " /* Call RTLdrLoadSystem(const char *pszFilename, bool fNoUnload, PRTLDRMOD phLdrMod); */\n" 1575 1521 " adrp x2, PAGE(g_hMod)\n" 1576 "#ifndef ASM_FORMAT_ELF\n"1577 1522 " add x2, x2, PAGEOFF(g_hMod)\n" 1578 "#else\n"1579 " ldr x2, [x2, PAGEOFF(g_hMod)]\n"1580 "#endif\n"1581 1523 " mov x1, #1\n" 1582 1524 " adrp x0, PAGE(g_szLibrary)\n" 1583 "#ifndef ASM_FORMAT_ELF\n"1584 1525 " add x0, x0, PAGEOFF(g_szLibrary)\n" 1585 "#else\n"1586 " ldr x0, [x0, PAGEOFF(g_szLibrary)]\n"1587 "#endif\n"1588 1526 " bl NAME(RTLdrLoadSystem)\n"); 1589 1527 fprintf(pOutput, … … 1601 1539 "\n" 1602 1540 " adrp x22, PAGE(g_szzNames)\n" 1603 "#ifndef ASM_FORMAT_ELF\n"1604 1541 " add x22, x22, PAGEOFF(g_szzNames)\n" 1605 "#else\n"1606 " ldr x22, [x22, PAGEOFF(g_szzNames)]\n"1607 "#endif\n"1608 1542 " adrp x23, PAGE(g_apfnImports)\n" 1609 "#ifndef ASM_FORMAT_ELF\n"1610 1543 " add x23, x23, PAGEOFF(g_apfnImports)\n" 1611 "#else\n"1612 " ldr x23, [x23, PAGEOFF(g_apfnImports)]\n"1613 "#endif\n"1614 1544 "Lexplicit_load_next_import:\n" 1615 1545 " ldr x0, [x23]\n"
Note:
See TracChangeset
for help on using the changeset viewer.
