Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-23 01:26:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avrdudes:main' into signature

Browse Source
This commit is contained in:
Stefan Rueger
2024-08-01 01:20:44 +01:00
committed by GitHub
parent cf0822bb71 6bb8b521d3
commit d13a821159
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/avr_opcodes.c
View File

@@ -591,7 +591,7 @@ const AVR_opcode avr_opcodes[MNEMO_N] = {
};
// Return whether or not the given 16-bit opcode is the mnemonic
int op16_is_mnemo(int op, int mnemo) {
int op16_is_mnemo(int op, AVR_mnemo mnemo) {
return mnemo < 0 || mnemo >= MNEMO_N? 0:
(op & avr_opcodes[mnemo].mask) != avr_opcodes[mnemo].value? 0:
!(avr_opcodes[mnemo].type & OTY_CONSTRAINT)? 1:

6
src/disasm.c
View File

@@ -473,18 +473,16 @@ static void lineout(const char *code, const char *comment,
if(cx->dis_pass == 2 && match) {
cx->dis_para++;
char *reflist = mmt_malloc(match*(3+64)), *r = reflist; // Worst case length
int mne = jc[first].mnemo, one_mne = 1, nnmne = 0;
int mne = jc[first].mnemo, one_mne = 1;
for(int i = first; i < cx->dis_jumpcallN && jc[i].to == here; i++) {
if(mne != jc[i].mnemo) { // More than one mnemonic reference this line
one_mne = 0;
output_references(avr_opcodes[mne].opcode, reflist);
mne = jc[i].mnemo;
r = reflist; *r = 0;
nnmne = 0;
}
strcpy(r, str_ccprintf(", L%0*x" + 2*(r==reflist), cx->dis_addrwidth, jc[i].from));
strcpy(r, str_ccprintf(&", L%0*x"[2*(r==reflist)], cx->dis_addrwidth, jc[i].from));
r += strlen(r);
nnmne++;
}
name = get_label_name(here, &comment);
if(!comment && strlen(reflist) + commentcol() < 70 && one_mne) { // Refs line with label

6
src/doc/avrdude.texi
View File

@@ -1320,10 +1320,10 @@ The generated on-board analog reference voltage for channel 0 or channel 1 can
be changed by specifying a new reference voltage.
The current reference voltage can be read by @samp{-x varef0} or
@samp{-x varef1} alone.
@item @samp{attemps[=<1..99>]}
@item @samp{attempts[=<1..99>]}
@var{STK500V1 only}
@*
Specify how many connection retry attemps to perform before exiting.
Specify how many connection retry attempts to perform before exiting.
Defaults to 10 if not specified.
@item @samp{xtal=VALUE[MHz|M|kHz|k|Hz|H]}
Defines the XTAL frequency of the programmer if it differs from 7.3728 MHz of the
@@ -1360,7 +1360,7 @@ Show help menu and exit.
The Arduino programmer type accepts the following extended parameter:
@table @code
@item @samp{attemps=VALUE}
@item @samp{attempts=VALUE}
Overide the default number of connection retry attempt by using @var{VALUE}.
@item @samp{help}
Show help menu and exit.