When selecting an ARM target on Debian unstable, we get:
Compiling C++ object libcommon.fa.p/disas_libvixl_vixl_utils.cc.o
FAILED: libcommon.fa.p/disas_libvixl_vixl_utils.cc.o
c++ -Ilibcommon.fa.p -I. -I.. [...] -o libcommon.fa.p/disas_libvixl_vixl_utils.cc.o -c ../disas/libvixl/vixl/utils.cc
In file included from /home/philmd/qemu/disas/libvixl/vixl/utils.h:30,
from ../disas/libvixl/vixl/utils.cc:27:
/usr/include/string.h:36:43: error: missing binary operator before token "("
36 | #if defined __cplusplus && (__GNUC_PREREQ (4, 4) \
| ^
/usr/include/string.h:53:62: error: missing binary operator before token "("
53 | #if defined __USE_MISC || defined __USE_XOPEN || __GLIBC_USE (ISOC2X)
| ^
/usr/include/string.h:165:21: error: missing binary operator before token "("
165 | || __GLIBC_USE (LIB_EXT2) || __GLIBC_USE (ISOC2X))
| ^
/usr/include/string.h:174:43: error: missing binary operator before token "("
174 | #if defined __USE_XOPEN2K8 || __GLIBC_USE (LIB_EXT2) || __GLIBC_USE (ISOC2X)
| ^
/usr/include/string.h:492:19: error: missing binary operator before token "("
492 | #if __GNUC_PREREQ (3,4)
| ^
Relevant information from the host:
$ lsb_release -d
Description: Debian GNU/Linux 11 (bullseye)
$ gcc --version
gcc (Debian 10.2.1-6) 10.2.1 20210110
$ dpkg -S /usr/include/string.h
libc6-dev: /usr/include/string.h
$ apt-cache show libc6-dev
Package: libc6-dev
Version: 2.31-11
Partially cherry-pick vixl commit 78973f258039f6e96 [*]:
Refactor VIXL to use `extern` block when including C header
that do not have a C++ counterpart.
which is similar to commit 875df03b22
('osdep: protect qemu/osdep.h
with extern "C"').
[*] https://git.linaro.org/arm/vixl.git/commit/?id=78973f258039f6e96
Buglink: https://bugs.launchpad.net/qemu/+bug/1914870
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 20210516171023.510778-1-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
114 lines
3.7 KiB
C++
114 lines
3.7 KiB
C++
// Copyright 2014, ARM Limited
|
|
// All rights reserved.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above copyright notice,
|
|
// this list of conditions and the following disclaimer in the documentation
|
|
// and/or other materials provided with the distribution.
|
|
// * Neither the name of ARM Limited nor the names of its contributors may be
|
|
// used to endorse or promote products derived from this software without
|
|
// specific prior written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS CONTRIBUTORS "AS IS" AND
|
|
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
|
|
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
#ifndef VIXL_CODE_BUFFER_H
|
|
#define VIXL_CODE_BUFFER_H
|
|
|
|
#include <cstring>
|
|
#include "vixl/globals.h"
|
|
|
|
namespace vixl {
|
|
|
|
class CodeBuffer {
|
|
public:
|
|
explicit CodeBuffer(size_t capacity = 4 * KBytes);
|
|
CodeBuffer(void* buffer, size_t capacity);
|
|
~CodeBuffer();
|
|
|
|
void Reset();
|
|
|
|
ptrdiff_t OffsetFrom(ptrdiff_t offset) const {
|
|
ptrdiff_t cursor_offset = cursor_ - buffer_;
|
|
VIXL_ASSERT((offset >= 0) && (offset <= cursor_offset));
|
|
return cursor_offset - offset;
|
|
}
|
|
|
|
ptrdiff_t CursorOffset() const {
|
|
return OffsetFrom(0);
|
|
}
|
|
|
|
template <typename T>
|
|
T GetOffsetAddress(ptrdiff_t offset) const {
|
|
VIXL_ASSERT((offset >= 0) && (offset <= (cursor_ - buffer_)));
|
|
return reinterpret_cast<T>(buffer_ + offset);
|
|
}
|
|
|
|
size_t RemainingBytes() const {
|
|
VIXL_ASSERT((cursor_ >= buffer_) && (cursor_ <= (buffer_ + capacity_)));
|
|
return (buffer_ + capacity_) - cursor_;
|
|
}
|
|
|
|
// A code buffer can emit:
|
|
// * 32-bit data: instruction and constant.
|
|
// * 64-bit data: constant.
|
|
// * string: debug info.
|
|
void Emit32(uint32_t data) { Emit(data); }
|
|
|
|
void Emit64(uint64_t data) { Emit(data); }
|
|
|
|
void EmitString(const char* string);
|
|
|
|
// Align to kInstructionSize.
|
|
void Align();
|
|
|
|
size_t capacity() const { return capacity_; }
|
|
|
|
bool IsManaged() const { return managed_; }
|
|
|
|
void Grow(size_t new_capacity);
|
|
|
|
bool IsDirty() const { return dirty_; }
|
|
|
|
void SetClean() { dirty_ = false; }
|
|
|
|
private:
|
|
template <typename T>
|
|
void Emit(T value) {
|
|
VIXL_ASSERT(RemainingBytes() >= sizeof(value));
|
|
dirty_ = true;
|
|
memcpy(cursor_, &value, sizeof(value));
|
|
cursor_ += sizeof(value);
|
|
}
|
|
|
|
// Backing store of the buffer.
|
|
byte* buffer_;
|
|
// If true the backing store is allocated and deallocated by the buffer. The
|
|
// backing store can then grow on demand. If false the backing store is
|
|
// provided by the user and cannot be resized internally.
|
|
bool managed_;
|
|
// Pointer to the next location to be written.
|
|
byte* cursor_;
|
|
// True if there has been any write since the buffer was created or cleaned.
|
|
bool dirty_;
|
|
// Capacity in bytes of the backing store.
|
|
size_t capacity_;
|
|
};
|
|
|
|
} // namespace vixl
|
|
|
|
#endif // VIXL_CODE_BUFFER_H
|
|
|