ardour/livetrax
13
0
Fork 0
Code

Fix ARM MIDI buffer alignment

Browse Source 
Both TimeType (8byte) and EventType (4byte) are written
in an un-aligned buffer (usually 3 byte MIDI messages).
This caused an Illegal Instruction for 32bit ARM builds
This commit is contained in:
Robin Gareus 2020-09-28 01:23:02 +02:00
parent 7e1ce160e9
commit 5abe677fea
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ardour/ardour/midi_buffer.h
View File

@ -117,7 +117,7 @@ public:
uint8_t* ev_start = buffer->_data + offset + sizeof(TimeType) + sizeof (Evoral::EventType);
int event_size = Evoral::midi_event_size(ev_start);
assert(event_size >= 0);
offset += sizeof(TimeType) + sizeof (Evoral::EventType) + event_size;
offset += align32 (sizeof(TimeType) + sizeof (Evoral::EventType) + event_size);
return *this;
}
@ -152,7 +152,7 @@ public:
return end();
}
size_t total_data_deleted = sizeof(TimeType) + sizeof (Evoral::EventType) + event_size;
size_t total_data_deleted = align32 (sizeof(TimeType) + sizeof (Evoral::EventType) + event_size);
if (i.offset + total_data_deleted > _size) {
_size = 0;
@ -188,6 +188,14 @@ private:
friend class iterator_base< MidiBuffer, Evoral::Event<TimeType> >;
friend class iterator_base< const MidiBuffer, const Evoral::Event<TimeType> >;
static size_t align32 (size_t s) {
#if defined(__arm__) || defined(__aarch64__)
return s + s % 4;
#else
return s;
#endif
}
uint8_t* _data; ///< [timestamp, event-type, event]*
pframes_t _size;
};

12
libs/ardour/midi_buffer.cc
View File

@ -191,7 +191,7 @@ MidiBuffer::push_back(TimeType time, Evoral::EventType event_type, size_t size,
*(reinterpret_cast<Evoral::EventType*>((uintptr_t)(write_loc + stamp_size))) = event_type;
memcpy(write_loc + stamp_size + etype_size, data, size);
_size += stamp_size + etype_size + size;
_size += align32 (stamp_size + etype_size + size);
_silent = false;
return true;
@ -209,7 +209,7 @@ MidiBuffer::insert_event(const Evoral::Event<TimeType>& ev)
const size_t stamp_size = sizeof(TimeType);
const size_t etype_size = sizeof(Evoral::EventType);
const size_t bytes_to_merge = stamp_size + etype_size + ev.size();
const size_t bytes_to_merge = align32 (stamp_size + etype_size + ev.size());
if (_size + bytes_to_merge >= _capacity) {
cerr << string_compose ("MidiBuffer::push_back failed (buffer is full: size: %1 capacity %2 new bytes %3)", _size, _capacity, bytes_to_merge) << endl;
@ -274,7 +274,7 @@ MidiBuffer::reserve(TimeType time, Evoral::EventType event_type, size_t size)
{
const size_t stamp_size = sizeof(TimeType);
const size_t etype_size = sizeof(Evoral::EventType);
if (_size + stamp_size + etype_size + size >= _capacity) {
if (align32 (_size + stamp_size + etype_size + size) >= _capacity) {
return 0;
}
@ -286,7 +286,7 @@ MidiBuffer::reserve(TimeType time, Evoral::EventType event_type, size_t size)
// move write_loc to begin of MIDI buffer data to write to
write_loc += stamp_size + etype_size;
_size += stamp_size + etype_size + size;
_size += align32 (stamp_size + etype_size + size);
_silent = false;
return write_loc;
@ -467,7 +467,7 @@ MidiBuffer::merge_in_place (const MidiBuffer &other)
if (merge_offset == -1) {
merge_offset = them.offset;
}
bytes_to_merge += header_size + (*them).size();
bytes_to_merge += align32 (header_size + (*them).size());
++them;
}
@ -528,7 +528,7 @@ MidiBuffer::merge_in_place (const MidiBuffer &other)
++us;
}
bytes_to_merge = header_size + (*them).size();
bytes_to_merge = align32 (header_size + (*them).size());
/* move our remaining events later in the buffer by
* enough to fit the one message we're going to merge