333 changes: 178 additions & 155 deletions src/core/bitop.d
Original file line number Diff line number Diff line change
Expand Up @@ -14,174 +14,197 @@
*/
module core.bitop;

extern(C) int printf(const char *, ...);

version( D_Ddoc )
nothrow:


/**
* Scans the bits in v starting with bit 0, looking
* for the first set bit.
* Returns:
* The bit number of the first bit set.
* The return value is undefined if v is zero.
* Example:
* ---
* import core.bitop;
*
* int main()
* {
* assert(bsr(0x21) == 5);
* return 0;
* }
*/
pure int bsf(size_t v);

unittest
{
/**
* Scans the bits in v starting with bit 0, looking
* for the first set bit.
* Returns:
* The bit number of the first bit set.
* The return value is undefined if v is zero.
*/
int bsf( uint v );

/**
* Scans the bits in v from the most significant bit
* to the least significant bit, looking
* for the first set bit.
* Returns:
* The bit number of the first bit set.
* The return value is undefined if v is zero.
* Example:
* ---
* import core.bitop;
*
* int main()
* {
* uint v;
* int x;
*
* v = 0x21;
* x = bsf(v);
* printf("bsf(x%x) = %d\n", v, x);
* x = bsr(v);
* printf("bsr(x%x) = %d\n", v, x);
* return 0;
* }
* ---
* Output:
* bsf(x21) = 0<br>
* bsr(x21) = 5
*/
int bsr( uint v );


/**
* Tests the bit.
*/
int bt( uint* p, uint bitnum );


/**
* Tests and complements the bit.
*/
int btc( uint* p, uint bitnum );


/**
* Tests and resets (sets to 0) the bit.
*/
int btr( uint* p, uint bitnum );


/**
* Tests and sets the bit.
* Params:
* p = a non-NULL pointer to an array of uints.
* index = a bit number, starting with bit 0 of p[0],
* and progressing. It addresses bits like the expression:
---
p[index / (uint.sizeof*8)] & (1 << (index & ((uint.sizeof*8) - 1)))
---
* Returns:
* A non-zero value if the bit was set, and a zero
* if it was clear.
*
* Example:
* ---
import core.bitop;
int main()
{
uint array[2];
assert(bsr(0x21) == 5);
}

/**
* Scans the bits in v from the most significant bit
* to the least significant bit, looking
* for the first set bit.
* Returns:
* The bit number of the first bit set.
* The return value is undefined if v is zero.
* Example:
* ---
* import core.bitop;
*
* int main()
* {
* assert(bsf(0x21) == 0);
* return 0;
* }
*/
pure int bsr(size_t v);

unittest
{
assert(bsf(0x21) == 0);
}

/**
* Tests the bit.
*/
pure int bt(in size_t* p, size_t bitnum);

array[0] = 2;
array[1] = 0x100;

printf("btc(array, 35) = %d\n", <b>btc</b>(array, 35));
printf("array = [0]:x%x, [1]:x%x\n", array[0], array[1]);
/**
* Tests and complements the bit.
*/
int btc(size_t* p, size_t bitnum);

printf("btc(array, 35) = %d\n", <b>btc</b>(array, 35));
printf("array = [0]:x%x, [1]:x%x\n", array[0], array[1]);

printf("bts(array, 35) = %d\n", <b>bts</b>(array, 35));
printf("array = [0]:x%x, [1]:x%x\n", array[0], array[1]);
/**
* Tests and resets (sets to 0) the bit.
*/
int btr(size_t* p, size_t bitnum);

printf("btr(array, 35) = %d\n", <b>btr</b>(array, 35));
printf("array = [0]:x%x, [1]:x%x\n", array[0], array[1]);

printf("bt(array, 1) = %d\n", <b>bt</b>(array, 1));
printf("array = [0]:x%x, [1]:x%x\n", array[0], array[1]);
/**
* Tests and sets the bit.
* Params:
* p = a non-NULL pointer to an array of size_ts.
* index = a bit number, starting with bit 0 of p[0],
* and progressing. It addresses bits like the expression:
---
p[index / (size_t.sizeof*8)] & (1 << (index & ((size_t.sizeof*8) - 1)))
---
* Returns:
* A non-zero value if the bit was set, and a zero
* if it was clear.
*
* Example:
* ---
import std.stdio;
import core.bitop;
return 0;
}
* ---
* Output:
<pre>
btc(array, 35) = 0
array = [0]:x2, [1]:x108
btc(array, 35) = -1
array = [0]:x2, [1]:x100
bts(array, 35) = 0
array = [0]:x2, [1]:x108
btr(array, 35) = -1
array = [0]:x2, [1]:x100
bt(array, 1) = -1
array = [0]:x2, [1]:x100
</pre>
*/
int bts( uint* p, uint bitnum );


/**
* Swaps bytes in a 4 byte uint end-to-end, i.e. byte 0 becomes
* byte 3, byte 1 becomes byte 2, byte 2 becomes byte 1, byte 3
* becomes byte 0.
*/
uint bswap( uint v );


/**
* Reads I/O port at port_address.
*/
ubyte inp( uint port_address );


/**
* ditto
*/
ushort inpw( uint port_address );


/**
* ditto
*/
uint inpl( uint port_address );


/**
* Writes and returns value to I/O port at port_address.
*/
ubyte outp( uint port_address, ubyte value );


/**
* ditto
*/
ushort outpw( uint port_address, ushort value );


/**
* ditto
*/
uint outpl( uint port_address, uint value );
int main()
{
size_t array[2];
array[0] = 2;
array[1] = 0x100;
assert(btc(array, 35) == 0);
assert(array[0] == 2);
assert(array[1] == 0x108);
assert(btc(array, 35) == -1);
assert(array[0] == 2);
assert(array[1] == 0x100);
assert(btc(array, 35) == 0);
assert(array[0] == 2);
assert(array[1] == 0x108);
assert(btc(array, 35) == -1);
assert(array[0] == 2);
assert(array[1] == 0x100);
assert(btc(array, 1) == -1);
assert(array[0] == 0);
assert(array[1] == 0x100);
return 0;
}
else
*/
int bts(size_t* p, size_t bitnum);

unittest
{
public import std.intrinsic;
size_t array[2];

array[0] = 2;
array[1] = 0x100;

assert(btc(array, 35) == 0);
assert(array[0] == 2);
assert(array[1] == 0x108);

assert(btc(array, 35) == -1);
assert(array[0] == 2);
assert(array[1] == 0x100);

assert(btc(array, 35) == 0);
assert(array[0] == 2);
assert(array[1] == 0x108);

assert(btc(array, 35) == -1);
assert(array[0] == 2);
assert(array[1] == 0x100);

assert(btc(array, 1) == -1);
assert(array[0] == 0);
assert(array[1] == 0x100);
}

/**
* Swaps bytes in a 4 byte uint end-to-end, i.e. byte 0 becomes
* byte 3, byte 1 becomes byte 2, byte 2 becomes byte 1, byte 3
* becomes byte 0.
*/
pure uint bswap(uint v);


/**
* Reads I/O port at port_address.
*/
ubyte inp(uint port_address);


/**
* ditto
*/
ushort inpw(uint port_address);


/**
* ditto
*/
uint inpl(uint port_address);


/**
* Writes and returns value to I/O port at port_address.
*/
ubyte outp(uint port_address, ubyte value);


/**
* ditto
*/
ushort outpw(uint port_address, ushort value);


/**
* ditto
*/
uint outpl(uint port_address, uint value);


/**
* Calculates the number of set bits in a 32-bit integer.
Expand Down
6 changes: 3 additions & 3 deletions src/gc/gcbits.d
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct GCBits
{
version (none)
{
return std.intrinsic.bt(data + 1, i); // this is actually slower! don't use
return core.bitop.bt(data + 1, i); // this is actually slower! don't use
}
else
{
Expand Down Expand Up @@ -119,7 +119,7 @@ struct GCBits
{
version (bitops)
{
return std.intrinsic.btr(data + 1, i); // this is faster!
return core.bitop.btr(data + 1, i); // this is faster!
}
else version (Asm86)
{
Expand Down Expand Up @@ -150,7 +150,7 @@ struct GCBits
{
version (bitops)
{
return std.intrinsic.bts(data + 1, i); // this is faster!
return core.bitop.bts(data + 1, i); // this is faster!
}
else version (Asm86)
{
Expand Down
1 change: 0 additions & 1 deletion win32.mak
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ MANIFEST= \
win32.mak \
\
import\object.di \
import\std\intrinsic.di \
\
src\object_.d \
\
Expand Down