Skip to content

Commit c23d202

Browse files
dhalbertdhalbert
authored
Merge pull request #1244 from urish/armthumb-fix
fix compilation errors in emitinlinethumb.c
2 parents 4745dda + cea079a commit c23d202

File tree

8 files changed

+447
-133
lines changed

8 files changed

+447
-133
lines changed

‎locale/circuitpython.pot

Lines changed: 58 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-10-03 23:15+0700\n"
11+
"POT-Creation-Date: 2018-10-07 02:07+0300\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -702,10 +702,6 @@ msgstr ""
702702
msgid "All SPI peripherals are in use"
703703
msgstr ""
704704

705-
#: ports/nrf/common-hal/busio/SPI.c:176
706-
msgid "Baud rate too high for this SPI peripheral"
707-
msgstr ""
708-
709705
#: ports/nrf/common-hal/busio/UART.c:48
710706
#, c-format
711707
msgid "error = 0x%08lX"
@@ -1095,38 +1091,85 @@ msgstr ""
10951091
msgid "'data' requires integer arguments"
10961092
msgstr ""
10971093

1098-
#: py/emitinlinextensa.c:86
1099-
msgid "can only have up to 4 parameters to Xtensa assembly"
1094+
#: py/emitinlinethumb.c:102
1095+
msgid "can only have up to 4 parameters to Thumb assembly"
11001096
msgstr ""
11011097

1102-
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1103-
msgid "parameters must be registers in sequence a2 to a5"
1098+
#: py/emitinlinethumb.c:107 py/emitinlinethumb.c:112
1099+
msgid "parameters must be registers in sequence r0 to r3"
11041100
msgstr ""
11051101

1106-
#: py/emitinlinextensa.c:162
1102+
#: py/emitinlinethumb.c:188 py/emitinlinethumb.c:230
1103+
#, c-format
1104+
msgid "'%s' expects at most r%d"
1105+
msgstr ""
1106+
1107+
#: py/emitinlinethumb.c:197 py/emitinlinextensa.c:162
11071108
#, c-format
11081109
msgid "'%s' expects a register"
11091110
msgstr ""
11101111

1111-
#: py/emitinlinextensa.c:169
1112+
#: py/emitinlinethumb.c:211
1113+
#, c-format
1114+
msgid "'%s' expects a special register"
1115+
msgstr ""
1116+
1117+
#: py/emitinlinethumb.c:239
1118+
#, c-format
1119+
msgid "'%s' expects an FPU register"
1120+
msgstr ""
1121+
1122+
#: py/emitinlinethumb.c:292
1123+
#, c-format
1124+
msgid "'%s' expects {r0, r1, ...}"
1125+
msgstr ""
1126+
1127+
#: py/emitinlinethumb.c:299 py/emitinlinextensa.c:169
11121128
#, c-format
11131129
msgid "'%s' expects an integer"
11141130
msgstr ""
11151131

1116-
#: py/emitinlinextensa.c:174
1132+
#: py/emitinlinethumb.c:304
11171133
#, c-format
1118-
msgid "'%s' integer %d is not within range %d..%d"
1134+
msgid "'%s' integer 0x%x does not fit in mask 0x%x"
11191135
msgstr ""
11201136

1121-
#: py/emitinlinextensa.c:182
1137+
#: py/emitinlinethumb.c:328
1138+
#, c-format
1139+
msgid "'%s' expects an address of the form [a, b]"
1140+
msgstr ""
1141+
1142+
#: py/emitinlinethumb.c:334 py/emitinlinextensa.c:182
11221143
#, c-format
11231144
msgid "'%s' expects a label"
11241145
msgstr ""
11251146

1126-
#: py/emitinlinextensa.c:193
1147+
#: py/emitinlinethumb.c:345 py/emitinlinextensa.c:193
11271148
msgid "label '%q' not defined"
11281149
msgstr ""
11291150

1151+
#: py/emitinlinethumb.c:806
1152+
#, c-format
1153+
msgid "unsupported Thumb instruction '%s' with %d arguments"
1154+
msgstr ""
1155+
1156+
#: py/emitinlinethumb.c:810
1157+
msgid "branch not in range"
1158+
msgstr ""
1159+
1160+
#: py/emitinlinextensa.c:86
1161+
msgid "can only have up to 4 parameters to Xtensa assembly"
1162+
msgstr ""
1163+
1164+
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1165+
msgid "parameters must be registers in sequence a2 to a5"
1166+
msgstr ""
1167+
1168+
#: py/emitinlinextensa.c:174
1169+
#, c-format
1170+
msgid "'%s' integer %d is not within range %d..%d"
1171+
msgstr ""
1172+
11301173
#: py/emitinlinextensa.c:327
11311174
#, c-format
11321175
msgid "unsupported Xtensa instruction '%s' with %d arguments"

‎locale/de_DE.po

Lines changed: 59 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-10-03 23:15+0700\n"
10+
"POT-Creation-Date: 2018-10-07 02:07+0300\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -713,10 +713,6 @@ msgstr "Alle timer werden benutzt"
713713
msgid "All SPI peripherals are in use"
714714
msgstr "Alle timer werden benutzt"
715715

716-
#: ports/nrf/common-hal/busio/SPI.c:176
717-
msgid "Baud rate too high for this SPI peripheral"
718-
msgstr ""
719-
720716
#: ports/nrf/common-hal/busio/UART.c:48
721717
#, c-format
722718
msgid "error = 0x%08lX"
@@ -1108,38 +1104,86 @@ msgstr ""
11081104
msgid "'data' requires integer arguments"
11091105
msgstr ""
11101106

1111-
#: py/emitinlinextensa.c:86
1112-
msgid "can only have up to 4 parameters to Xtensa assembly"
1107+
#: py/emitinlinethumb.c:102
1108+
msgid "can only have up to 4 parameters to Thumb assembly"
11131109
msgstr ""
11141110

1115-
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1116-
msgid "parameters must be registers in sequence a2 to a5"
1111+
#: py/emitinlinethumb.c:107 py/emitinlinethumb.c:112
1112+
msgid "parameters must be registers in sequence r0 to r3"
11171113
msgstr ""
11181114

1119-
#: py/emitinlinextensa.c:162
1115+
#: py/emitinlinethumb.c:188 py/emitinlinethumb.c:230
1116+
#, c-format
1117+
msgid "'%s' expects at most r%d"
1118+
msgstr ""
1119+
1120+
#: py/emitinlinethumb.c:197 py/emitinlinextensa.c:162
11201121
#, c-format
11211122
msgid "'%s' expects a register"
11221123
msgstr ""
11231124

1124-
#: py/emitinlinextensa.c:169
1125+
#: py/emitinlinethumb.c:211
1126+
#, c-format
1127+
msgid "'%s' expects a special register"
1128+
msgstr ""
1129+
1130+
#: py/emitinlinethumb.c:239
1131+
#, c-format
1132+
msgid "'%s' expects an FPU register"
1133+
msgstr ""
1134+
1135+
#: py/emitinlinethumb.c:292
1136+
#, c-format
1137+
msgid "'%s' expects {r0, r1, ...}"
1138+
msgstr ""
1139+
1140+
#: py/emitinlinethumb.c:299 py/emitinlinextensa.c:169
11251141
#, c-format
11261142
msgid "'%s' expects an integer"
11271143
msgstr ""
11281144

1129-
#: py/emitinlinextensa.c:174
1145+
#: py/emitinlinethumb.c:304
11301146
#, c-format
1131-
msgid "'%s' integer %d is not within range %d..%d"
1147+
msgid "'%s' integer 0x%x does not fit in mask 0x%x"
1148+
msgstr ""
1149+
1150+
#: py/emitinlinethumb.c:328
1151+
#, c-format
1152+
msgid "'%s' expects an address of the form [a, b]"
11321153
msgstr ""
11331154

1134-
#: py/emitinlinextensa.c:182
1155+
#: py/emitinlinethumb.c:334 py/emitinlinextensa.c:182
11351156
#, c-format
11361157
msgid "'%s' expects a label"
11371158
msgstr ""
11381159

1139-
#: py/emitinlinextensa.c:193
1160+
#: py/emitinlinethumb.c:345 py/emitinlinextensa.c:193
11401161
msgid "label '%q' not defined"
11411162
msgstr ""
11421163

1164+
#: py/emitinlinethumb.c:806
1165+
#, c-format
1166+
msgid "unsupported Thumb instruction '%s' with %d arguments"
1167+
msgstr ""
1168+
1169+
#: py/emitinlinethumb.c:810
1170+
#, fuzzy
1171+
msgid "branch not in range"
1172+
msgstr "Kalibrierung ist außerhalb der Reichweite"
1173+
1174+
#: py/emitinlinextensa.c:86
1175+
msgid "can only have up to 4 parameters to Xtensa assembly"
1176+
msgstr ""
1177+
1178+
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1179+
msgid "parameters must be registers in sequence a2 to a5"
1180+
msgstr ""
1181+
1182+
#: py/emitinlinextensa.c:174
1183+
#, c-format
1184+
msgid "'%s' integer %d is not within range %d..%d"
1185+
msgstr ""
1186+
11431187
#: py/emitinlinextensa.c:327
11441188
#, c-format
11451189
msgid "unsupported Xtensa instruction '%s' with %d arguments"

‎locale/en_US.po

Lines changed: 58 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-10-03 23:15+0700\n"
10+
"POT-Creation-Date: 2018-10-07 02:07+0300\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -702,10 +702,6 @@ msgstr ""
702702
msgid "All SPI peripherals are in use"
703703
msgstr ""
704704

705-
#: ports/nrf/common-hal/busio/SPI.c:176
706-
msgid "Baud rate too high for this SPI peripheral"
707-
msgstr ""
708-
709705
#: ports/nrf/common-hal/busio/UART.c:48
710706
#, c-format
711707
msgid "error = 0x%08lX"
@@ -1095,38 +1091,85 @@ msgstr ""
10951091
msgid "'data' requires integer arguments"
10961092
msgstr ""
10971093

1098-
#: py/emitinlinextensa.c:86
1099-
msgid "can only have up to 4 parameters to Xtensa assembly"
1094+
#: py/emitinlinethumb.c:102
1095+
msgid "can only have up to 4 parameters to Thumb assembly"
11001096
msgstr ""
11011097

1102-
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1103-
msgid "parameters must be registers in sequence a2 to a5"
1098+
#: py/emitinlinethumb.c:107 py/emitinlinethumb.c:112
1099+
msgid "parameters must be registers in sequence r0 to r3"
11041100
msgstr ""
11051101

1106-
#: py/emitinlinextensa.c:162
1102+
#: py/emitinlinethumb.c:188 py/emitinlinethumb.c:230
1103+
#, c-format
1104+
msgid "'%s' expects at most r%d"
1105+
msgstr ""
1106+
1107+
#: py/emitinlinethumb.c:197 py/emitinlinextensa.c:162
11071108
#, c-format
11081109
msgid "'%s' expects a register"
11091110
msgstr ""
11101111

1111-
#: py/emitinlinextensa.c:169
1112+
#: py/emitinlinethumb.c:211
1113+
#, c-format
1114+
msgid "'%s' expects a special register"
1115+
msgstr ""
1116+
1117+
#: py/emitinlinethumb.c:239
1118+
#, c-format
1119+
msgid "'%s' expects an FPU register"
1120+
msgstr ""
1121+
1122+
#: py/emitinlinethumb.c:292
1123+
#, c-format
1124+
msgid "'%s' expects {r0, r1, ...}"
1125+
msgstr ""
1126+
1127+
#: py/emitinlinethumb.c:299 py/emitinlinextensa.c:169
11121128
#, c-format
11131129
msgid "'%s' expects an integer"
11141130
msgstr ""
11151131

1116-
#: py/emitinlinextensa.c:174
1132+
#: py/emitinlinethumb.c:304
11171133
#, c-format
1118-
msgid "'%s' integer %d is not within range %d..%d"
1134+
msgid "'%s' integer 0x%x does not fit in mask 0x%x"
11191135
msgstr ""
11201136

1121-
#: py/emitinlinextensa.c:182
1137+
#: py/emitinlinethumb.c:328
1138+
#, c-format
1139+
msgid "'%s' expects an address of the form [a, b]"
1140+
msgstr ""
1141+
1142+
#: py/emitinlinethumb.c:334 py/emitinlinextensa.c:182
11221143
#, c-format
11231144
msgid "'%s' expects a label"
11241145
msgstr ""
11251146

1126-
#: py/emitinlinextensa.c:193
1147+
#: py/emitinlinethumb.c:345 py/emitinlinextensa.c:193
11271148
msgid "label '%q' not defined"
11281149
msgstr ""
11291150

1151+
#: py/emitinlinethumb.c:806
1152+
#, c-format
1153+
msgid "unsupported Thumb instruction '%s' with %d arguments"
1154+
msgstr ""
1155+
1156+
#: py/emitinlinethumb.c:810
1157+
msgid "branch not in range"
1158+
msgstr ""
1159+
1160+
#: py/emitinlinextensa.c:86
1161+
msgid "can only have up to 4 parameters to Xtensa assembly"
1162+
msgstr ""
1163+
1164+
#: py/emitinlinextensa.c:91 py/emitinlinextensa.c:96
1165+
msgid "parameters must be registers in sequence a2 to a5"
1166+
msgstr ""
1167+
1168+
#: py/emitinlinextensa.c:174
1169+
#, c-format
1170+
msgid "'%s' integer %d is not within range %d..%d"
1171+
msgstr ""
1172+
11301173
#: py/emitinlinextensa.c:327
11311174
#, c-format
11321175
msgid "unsupported Xtensa instruction '%s' with %d arguments"

0 commit comments

Comments
 (0)