ObjFW  Diff

Differences From Artifact [4ed7c72a5b]:

To Artifact [d5b97d5660]:


82
83
84
85
86
87
88

89




90

91




92
93





94
95
96
97
98
99
100
101
102
103
104
105





106

107




108
109





110
111
112
113
114
115
116
117
118
119
120
121
122
123





124

125
126
127






128
129
130
131
132
133
134
82
83
84
85
86
87
88
89

90
91
92
93
94
95

96
97
98
99
100

101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116

117
118
119
120
121
122
123

124
125
126
127
128

129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146

147
148
149
150
151
152
153



154
155
156
157
158
159
160
161
162
163
164
165
166







+
-
+
+
+
+

+
-
+
+
+
+

-
+
+
+
+
+











-
+
+
+
+
+

+
-
+
+
+
+

-
+
+
+
+
+













-
+
+
+
+
+

+
-
-
-
+
+
+
+
+
+







	    (i & UINT64_C(0x00000000000000FF)) << 56;
}

static OF_INLINE uint16_t
OF_BSWAP16_NONCONST(uint16_t i)
{
#if defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
	__asm__ (
	__asm__ ("xchgb	%h0, %b0" : "=Q"(i) : "0"(i));
	    "xchgb	%h0, %b0"
	    : "=Q"(i)
	    : "0"(i)
	);
#elif defined(OF_PPC_ASM)
	__asm__ (
	__asm__ ("lhbrx	%0, 0, %1" : "=r"(i) : "r"(&i), "m"(i));
	    "lhbrx	%0, 0, %1"
	    : "=r"(i)
	    : "r"(&i), "m"(i)
	);
#elif defined(OF_ARM_ASM)
	__asm__ ("rev16	%0, %0" : "=r"(i) : "0"(i));
	__asm__ (
	    "rev16	%0, %0"
	    : "=r"(i)
	    : "0"(i)
	);
#else
	i = (i & UINT16_C(0xFF00)) >> 8 |
	    (i & UINT16_C(0x00FF)) << 8;
#endif
	return i;
}

static OF_INLINE uint32_t
OF_BSWAP32_NONCONST(uint32_t i)
{
#if defined(OF_X86_ASM) || defined(OF_AMD64_ASM)
	__asm__ ("bswap	%0" : "=q"(i) : "0"(i));
	__asm__ (
	    "bswap	%0"
	    : "=q"(i)
	    : "0"(i)
	);
#elif defined(OF_PPC_ASM)
	__asm__ (
	__asm__ ("lwbrx	%0, 0, %1" : "=r"(i) : "r"(&i), "m"(i));
	    "lwbrx	%0, 0, %1"
	    : "=r"(i)
	    : "r"(&i), "m"(i)
	);
#elif defined(OF_ARM_ASM)
	__asm__ ("rev	%0, %0" : "=r"(i) : "0"(i));
	__asm__ (
	    "rev	%0, %0"
	    : "=r"(i)
	    : "0"(i)
	);
#else
	i = (i & UINT32_C(0xFF000000)) >> 24 |
	    (i & UINT32_C(0x00FF0000)) >>  8 |
	    (i & UINT32_C(0x0000FF00)) <<  8 |
	    (i & UINT32_C(0x000000FF)) << 24;
#endif
	return i;
}

static OF_INLINE uint64_t
OF_BSWAP64_NONCONST(uint64_t i)
{
#if defined(OF_AMD64_ASM)
	__asm__ ("bswap	%0" : "=r"(i) : "0"(i));
	__asm__ (
	    "bswap	%0"
	    : "=r"(i)
	    : "0"(i)
	);
#elif defined(OF_X86_ASM)
	__asm__ (
	__asm__ ("bswap	%%eax\n\t"
		 "bswap	%%edx\n\t"
		 "xchgl	%%eax, %%edx" : "=A"(i) : "0"(i));
	    "bswap	%%eax\n\t"
	    "bswap	%%edx\n\t"
	    "xchgl	%%eax, %%edx"
	    : "=A"(i)
	    : "0"(i)
	);
#else
	i = (uint64_t)OF_BSWAP32_NONCONST(i & 0xFFFFFFFF) << 32 |
	    OF_BSWAP32_NONCONST(i >> 32);
#endif
	return i;
}