gwj / at91sam9263 · Commits

Commit a4e7dd5267dcc74a3b7a6bd53a7259eb427a32e3

Authored by blueswir1
1 parent 204c1674

Remove currently unnecessary alignment masking 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4505 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 57 additions and 57 deletions
target-sparc/op_helper.c
  View file @a4e7dd5
... ... @@ -929,14 +929,14 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
929 929 ret = ldub_code(addr);
930 930 break;
931 931 case 2:
932   - ret = lduw_code(addr & ~1);
  932 + ret = lduw_code(addr);
933 933 break;
934 934 default:
935 935 case 4:
936   - ret = ldl_code(addr & ~3);
  936 + ret = ldl_code(addr);
937 937 break;
938 938 case 8:
939   - ret = ldq_code(addr & ~7);
  939 + ret = ldq_code(addr);
940 940 break;
941 941 }
942 942 break;
... ... @@ -946,14 +946,14 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
946 946 ret = ldub_user(addr);
947 947 break;
948 948 case 2:
949   - ret = lduw_user(addr & ~1);
  949 + ret = lduw_user(addr);
950 950 break;
951 951 default:
952 952 case 4:
953   - ret = ldl_user(addr & ~3);
  953 + ret = ldl_user(addr);
954 954 break;
955 955 case 8:
956   - ret = ldq_user(addr & ~7);
  956 + ret = ldq_user(addr);
957 957 break;
958 958 }
959 959 break;
... ... @@ -963,14 +963,14 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
963 963 ret = ldub_kernel(addr);
964 964 break;
965 965 case 2:
966   - ret = lduw_kernel(addr & ~1);
  966 + ret = lduw_kernel(addr);
967 967 break;
968 968 default:
969 969 case 4:
970   - ret = ldl_kernel(addr & ~3);
  970 + ret = ldl_kernel(addr);
971 971 break;
972 972 case 8:
973   - ret = ldq_kernel(addr & ~7);
  973 + ret = ldq_kernel(addr);
974 974 break;
975 975 }
976 976 break;
... ... @@ -985,14 +985,14 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
985 985 ret = ldub_phys(addr);
986 986 break;
987 987 case 2:
988   - ret = lduw_phys(addr & ~1);
  988 + ret = lduw_phys(addr);
989 989 break;
990 990 default:
991 991 case 4:
992   - ret = ldl_phys(addr & ~3);
  992 + ret = ldl_phys(addr);
993 993 break;
994 994 case 8:
995   - ret = ldq_phys(addr & ~7);
  995 + ret = ldq_phys(addr);
996 996 break;
997 997 }
998 998 break;
... ... @@ -1003,16 +1003,16 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
1003 1003 | ((target_phys_addr_t)(asi & 0xf) << 32));
1004 1004 break;
1005 1005 case 2:
1006   - ret = lduw_phys((target_phys_addr_t)(addr & ~1)
  1006 + ret = lduw_phys((target_phys_addr_t)addr
1007 1007 | ((target_phys_addr_t)(asi & 0xf) << 32));
1008 1008 break;
1009 1009 default:
1010 1010 case 4:
1011   - ret = ldl_phys((target_phys_addr_t)(addr & ~3)
  1011 + ret = ldl_phys((target_phys_addr_t)addr
1012 1012 | ((target_phys_addr_t)(asi & 0xf) << 32));
1013 1013 break;
1014 1014 case 8:
1015   - ret = ldq_phys((target_phys_addr_t)(addr & ~7)
  1015 + ret = ldq_phys((target_phys_addr_t)addr
1016 1016 | ((target_phys_addr_t)(asi & 0xf) << 32));
1017 1017 break;
1018 1018 }
... ... @@ -1241,14 +1241,14 @@ void helper_st_asi(target_ulong addr, uint64_t val, int asi, int size)
1241 1241 stb_user(addr, val);
1242 1242 break;
1243 1243 case 2:
1244   - stw_user(addr & ~1, val);
  1244 + stw_user(addr, val);
1245 1245 break;
1246 1246 default:
1247 1247 case 4:
1248   - stl_user(addr & ~3, val);
  1248 + stl_user(addr, val);
1249 1249 break;
1250 1250 case 8:
1251   - stq_user(addr & ~7, val);
  1251 + stq_user(addr, val);
1252 1252 break;
1253 1253 }
1254 1254 break;
... ... @@ -1258,14 +1258,14 @@ void helper_st_asi(target_ulong addr, uint64_t val, int asi, int size)
1258 1258 stb_kernel(addr, val);
1259 1259 break;
1260 1260 case 2:
1261   - stw_kernel(addr & ~1, val);
  1261 + stw_kernel(addr, val);
1262 1262 break;
1263 1263 default:
1264 1264 case 4:
1265   - stl_kernel(addr & ~3, val);
  1265 + stl_kernel(addr, val);
1266 1266 break;
1267 1267 case 8:
1268   - stq_kernel(addr & ~7, val);
  1268 + stq_kernel(addr, val);
1269 1269 break;
1270 1270 }
1271 1271 break;
... ... @@ -1311,14 +1311,14 @@ void helper_st_asi(target_ulong addr, uint64_t val, int asi, int size)
1311 1311 stb_phys(addr, val);
1312 1312 break;
1313 1313 case 2:
1314   - stw_phys(addr & ~1, val);
  1314 + stw_phys(addr, val);
1315 1315 break;
1316 1316 case 4:
1317 1317 default:
1318   - stl_phys(addr & ~3, val);
  1318 + stl_phys(addr, val);
1319 1319 break;
1320 1320 case 8:
1321   - stq_phys(addr & ~7, val);
  1321 + stq_phys(addr, val);
1322 1322 break;
1323 1323 }
1324 1324 }
... ... @@ -1331,16 +1331,16 @@ void helper_st_asi(target_ulong addr, uint64_t val, int asi, int size)
1331 1331 | ((target_phys_addr_t)(asi & 0xf) << 32), val);
1332 1332 break;
1333 1333 case 2:
1334   - stw_phys((target_phys_addr_t)(addr & ~1)
  1334 + stw_phys((target_phys_addr_t)addr
1335 1335 | ((target_phys_addr_t)(asi & 0xf) << 32), val);
1336 1336 break;
1337 1337 case 4:
1338 1338 default:
1339   - stl_phys((target_phys_addr_t)(addr & ~3)
  1339 + stl_phys((target_phys_addr_t)addr
1340 1340 | ((target_phys_addr_t)(asi & 0xf) << 32), val);
1341 1341 break;
1342 1342 case 8:
1343   - stq_phys((target_phys_addr_t)(addr & ~7)
  1343 + stq_phys((target_phys_addr_t)addr
1344 1344 | ((target_phys_addr_t)(asi & 0xf) << 32), val);
1345 1345 break;
1346 1346 }
... ... @@ -1395,14 +1395,14 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
1395 1395 ret = ldub_raw(addr);
1396 1396 break;
1397 1397 case 2:
1398   - ret = lduw_raw(addr & ~1);
  1398 + ret = lduw_raw(addr);
1399 1399 break;
1400 1400 case 4:
1401   - ret = ldl_raw(addr & ~3);
  1401 + ret = ldl_raw(addr);
1402 1402 break;
1403 1403 default:
1404 1404 case 8:
1405   - ret = ldq_raw(addr & ~7);
  1405 + ret = ldq_raw(addr);
1406 1406 break;
1407 1407 }
1408 1408 }
... ... @@ -1503,14 +1503,14 @@ void helper_st_asi(target_ulong addr, target_ulong val, int asi, int size)
1503 1503 stb_raw(addr, val);
1504 1504 break;
1505 1505 case 2:
1506   - stw_raw(addr & ~1, val);
  1506 + stw_raw(addr, val);
1507 1507 break;
1508 1508 case 4:
1509   - stl_raw(addr & ~3, val);
  1509 + stl_raw(addr, val);
1510 1510 break;
1511 1511 case 8:
1512 1512 default:
1513   - stq_raw(addr & ~7, val);
  1513 + stq_raw(addr, val);
1514 1514 break;
1515 1515 }
1516 1516 }
... ... @@ -1558,14 +1558,14 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
1558 1558 ret = ldub_hypv(addr);
1559 1559 break;
1560 1560 case 2:
1561   - ret = lduw_hypv(addr & ~1);
  1561 + ret = lduw_hypv(addr);
1562 1562 break;
1563 1563 case 4:
1564   - ret = ldl_hypv(addr & ~3);
  1564 + ret = ldl_hypv(addr);
1565 1565 break;
1566 1566 default:
1567 1567 case 8:
1568   - ret = ldq_hypv(addr & ~7);
  1568 + ret = ldq_hypv(addr);
1569 1569 break;
1570 1570 }
1571 1571 } else {
... ... @@ -1574,14 +1574,14 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
1574 1574 ret = ldub_kernel(addr);
1575 1575 break;
1576 1576 case 2:
1577   - ret = lduw_kernel(addr & ~1);
  1577 + ret = lduw_kernel(addr);
1578 1578 break;
1579 1579 case 4:
1580   - ret = ldl_kernel(addr & ~3);
  1580 + ret = ldl_kernel(addr);
1581 1581 break;
1582 1582 default:
1583 1583 case 8:
1584   - ret = ldq_kernel(addr & ~7);
  1584 + ret = ldq_kernel(addr);
1585 1585 break;
1586 1586 }
1587 1587 }
... ... @@ -1591,14 +1591,14 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
1591 1591 ret = ldub_user(addr);
1592 1592 break;
1593 1593 case 2:
1594   - ret = lduw_user(addr & ~1);
  1594 + ret = lduw_user(addr);
1595 1595 break;
1596 1596 case 4:
1597   - ret = ldl_user(addr & ~3);
  1597 + ret = ldl_user(addr);
1598 1598 break;
1599 1599 default:
1600 1600 case 8:
1601   - ret = ldq_user(addr & ~7);
  1601 + ret = ldq_user(addr);
1602 1602 break;
1603 1603 }
1604 1604 }
... ... @@ -1613,14 +1613,14 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
1613 1613 ret = ldub_phys(addr);
1614 1614 break;
1615 1615 case 2:
1616   - ret = lduw_phys(addr & ~1);
  1616 + ret = lduw_phys(addr);
1617 1617 break;
1618 1618 case 4:
1619   - ret = ldl_phys(addr & ~3);
  1619 + ret = ldl_phys(addr);
1620 1620 break;
1621 1621 default:
1622 1622 case 8:
1623   - ret = ldq_phys(addr & ~7);
  1623 + ret = ldq_phys(addr);
1624 1624 break;
1625 1625 }
1626 1626 break;
... ... @@ -1806,14 +1806,14 @@ void helper_st_asi(target_ulong addr, target_ulong val, int asi, int size)
1806 1806 stb_hypv(addr, val);
1807 1807 break;
1808 1808 case 2:
1809   - stw_hypv(addr & ~1, val);
  1809 + stw_hypv(addr, val);
1810 1810 break;
1811 1811 case 4:
1812   - stl_hypv(addr & ~3, val);
  1812 + stl_hypv(addr, val);
1813 1813 break;
1814 1814 case 8:
1815 1815 default:
1816   - stq_hypv(addr & ~7, val);
  1816 + stq_hypv(addr, val);
1817 1817 break;
1818 1818 }
1819 1819 } else {
... ... @@ -1822,14 +1822,14 @@ void helper_st_asi(target_ulong addr, target_ulong val, int asi, int size)
1822 1822 stb_kernel(addr, val);
1823 1823 break;
1824 1824 case 2:
1825   - stw_kernel(addr & ~1, val);
  1825 + stw_kernel(addr, val);
1826 1826 break;
1827 1827 case 4:
1828   - stl_kernel(addr & ~3, val);
  1828 + stl_kernel(addr, val);
1829 1829 break;
1830 1830 case 8:
1831 1831 default:
1832   - stq_kernel(addr & ~7, val);
  1832 + stq_kernel(addr, val);
1833 1833 break;
1834 1834 }
1835 1835 }
... ... @@ -1839,14 +1839,14 @@ void helper_st_asi(target_ulong addr, target_ulong val, int asi, int size)
1839 1839 stb_user(addr, val);
1840 1840 break;
1841 1841 case 2:
1842   - stw_user(addr & ~1, val);
  1842 + stw_user(addr, val);
1843 1843 break;
1844 1844 case 4:
1845   - stl_user(addr & ~3, val);
  1845 + stl_user(addr, val);
1846 1846 break;
1847 1847 case 8:
1848 1848 default:
1849   - stq_user(addr & ~7, val);
  1849 + stq_user(addr, val);
1850 1850 break;
1851 1851 }
1852 1852 }
... ... @@ -1861,14 +1861,14 @@ void helper_st_asi(target_ulong addr, target_ulong val, int asi, int size)
1861 1861 stb_phys(addr, val);
1862 1862 break;
1863 1863 case 2:
1864   - stw_phys(addr & ~1, val);
  1864 + stw_phys(addr, val);
1865 1865 break;
1866 1866 case 4:
1867   - stl_phys(addr & ~3, val);
  1867 + stl_phys(addr, val);
1868 1868 break;
1869 1869 case 8:
1870 1870 default:
1871   - stq_phys(addr & ~7, val);
  1871 + stq_phys(addr, val);
1872 1872 break;
1873 1873 }
1874 1874 }
... ...