Skip to content

Commit 53e5146

Browse files
committed
rewriter: reformat CAbi.h, DetermineAbi.{h,cpp}
1 parent c5e8467 commit 53e5146

File tree

3 files changed

+55
-20
lines changed

3 files changed

+55
-20
lines changed

tools/rewriter/CAbi.h

+43-13
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#pragma once
2+
23
#include <cassert>
34
#include <cstdint>
4-
#include <vector>
55
#include <string>
6+
#include <vector>
67

78
class ArgLocation {
89
public:
@@ -23,18 +24,20 @@ class ArgLocation {
2324
Kind _kind;
2425
unsigned _size;
2526
unsigned _align;
26-
const char* _reg = nullptr;
27+
const char *_reg = nullptr;
2728
size_t _stack_offset = 0;
2829

2930
public:
3031
static ArgLocation Register(Kind kind, unsigned size) {
3132
return ArgLocation(kind, size, size);
3233
}
33-
static ArgLocation Stack(int64_t size, int64_t align) {
34-
auto loc = ArgLocation(Kind::Memory, static_cast<unsigned>(size), static_cast<unsigned>(align));
34+
35+
static ArgLocation Stack(int64_t size, int64_t align) {
36+
auto loc = ArgLocation(Kind::Memory, static_cast<unsigned>(size), static_cast<unsigned>(align));
3537
loc._onStack = true;
3638
return loc;
3739
}
40+
3841
static ArgLocation Indirect(unsigned size, unsigned align) {
3942
auto loc = ArgLocation(Kind::Integral, static_cast<unsigned>(size), static_cast<unsigned>(align));
4043
loc._indirectOnStack = true;
@@ -46,35 +49,62 @@ class ArgLocation {
4649
_allocated = true;
4750
_reg = r;
4851
}
52+
4953
void allocate_stack(size_t offset) {
5054
assert(!_allocated);
5155
_allocated = true;
5256
_onStack = true;
5357
_stack_offset = offset;
5458
}
59+
5560
void set_indirect_on_stack() {
5661
assert(!_indirectOnStack);
5762
_indirectOnStack = true;
5863
}
5964

60-
bool is_allocated() const { return _allocated; }
61-
bool is_stack() const { return _onStack; }
62-
bool is_indirect() const { return _indirectOnStack; }
65+
bool is_allocated() const {
66+
return _allocated;
67+
}
68+
69+
bool is_stack() const {
70+
return _onStack;
71+
}
72+
73+
bool is_indirect() const {
74+
return _indirectOnStack;
75+
}
76+
6377
bool is_128bit_float() const {
6478
return _reg != nullptr && ((_reg[0] == 'x' && _reg[1] == 'm' && _reg[2] == 'm') || _reg[0] == 'q');
6579
}
66-
const char* as_str() const {
80+
81+
const char *as_str() const {
6782
if (_onStack) {
6883
return "<stack>";
6984
} else {
7085
return _reg;
7186
}
7287
}
73-
operator const char *() const { return as_str(); }
74-
Kind kind() const { return _kind; }
75-
size_t size() const { return is_128bit_float() ? 16 : _size; }
76-
size_t align() const { return _align; }
77-
size_t stack_offset() const { return _stack_offset; }
88+
89+
operator const char *() const {
90+
return as_str();
91+
}
92+
93+
Kind kind() const {
94+
return _kind;
95+
}
96+
97+
size_t size() const {
98+
return is_128bit_float() ? 16 : _size;
99+
}
100+
101+
size_t align() const {
102+
return _align;
103+
}
104+
105+
size_t stack_offset() const {
106+
return _stack_offset;
107+
}
78108
};
79109

80110
struct AbiSignature {

tools/rewriter/DetermineAbi.cpp

+10-5
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,14 @@
2222
#define VERBOSE_DEBUG 0
2323

2424
#if VERBOSE_DEBUG
25-
#define DEBUG(X) do { X; } while (0)
25+
#define DEBUG(X) \
26+
do { \
27+
X; \
28+
} while (0)
2629
#else
27-
#define DEBUG(X) do { } while (0)
30+
#define DEBUG(X) \
31+
do { \
32+
} while (0)
2833
#endif
2934

3035
static ArgLocation classifyScalarType(const llvm::Type &type) {
@@ -104,7 +109,7 @@ abiSlotsForArg(const clang::QualType &qt,
104109
// We have a scalar type, so classify it.
105110
return {classifyScalarType(*Ty)};
106111
}
107-
case Kind::Ignore: // no ABI presence
112+
case Kind::Ignore: // no ABI presence
108113
return {};
109114
case Kind::InAlloca: // via implicit pointer
110115
// It looks like inalloca is only valid on Win32
@@ -139,7 +144,7 @@ cgFunctionInfo(clang::CodeGen::CodeGenModule &cgm,
139144
}
140145

141146
AbiSignature determineAbi(const clang::CodeGen::CGFunctionInfo &info,
142-
const clang::ASTContext &astContext, Arch arch) {
147+
const clang::ASTContext &astContext, Arch arch) {
143148
// get ABI for return type and each parameter
144149
AbiSignature sig;
145150
sig.variadic = info.isVariadic();
@@ -220,7 +225,7 @@ AbiSignature determineAbiForDecl(const clang::FunctionDecl &fnDecl, Arch arch) {
220225
}
221226

222227
AbiSignature determineAbiForProtoType(const clang::FunctionProtoType &fpt,
223-
clang::ASTContext &astContext, Arch arch) {
228+
clang::ASTContext &astContext, Arch arch) {
224229
// FIXME: This is copied verbatim from determineAbiForDecl and could be
225230
// factored out. This depends on what we do with PR #78 so I'm leaving it as
226231
// is for now.

tools/rewriter/DetermineAbi.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
auto determineAbiForDecl(const clang::FunctionDecl &fnDecl, Arch arch) -> AbiSignature;
77

88
AbiSignature determineAbiForProtoType(const clang::FunctionProtoType &fpt,
9-
clang::ASTContext &astContext,
10-
Arch arch);
9+
clang::ASTContext &astContext,
10+
Arch arch);

0 commit comments

Comments
 (0)