ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bitwise operators, all function arguments take object types so they display correctly under the lua function list.

This commit is contained in:
pasky1382 2012-09-02 14:20:08 +00:00
parent 8bed5ae6da
commit 6a8c87d598
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
BizHawk.MultiClient/LuaImplementation.cs
View File

@ -1626,40 +1626,40 @@ namespace BizHawk.MultiClient
//---------------------------------------------------- //----------------------------------------------------
//Bitwise Operator library //Bitwise Operator library
//---------------------------------------------------- //----------------------------------------------------
public uint bit_band(uint lua_v, uint amt) public uint bit_band(object lua_v, object amt)
{ {
return lua_v & amt; return (uint) lua_v & (uint) amt;
} }
public uint bit_lshift(uint lua_v, int amt) public uint bit_lshift(object lua_v, object amt)
{ {
return lua_v << amt; return (uint) lua_v << (int) amt;
} }
public uint bit_rshift(uint lua_v, int amt) public uint bit_rshift(object lua_v, object amt)
{ {
return lua_v >> amt; return (uint) lua_v >> (int)amt;
} }
public uint bit_rol(uint lua_v, int amt) public uint bit_rol(object lua_v, object amt)
{ {
return (uint) ((lua_v << amt) | (lua_v >> (32 -amt))); return ((uint) lua_v << (int)amt) | ((uint) lua_v >> (32 - (int) amt));
} }
public uint bit_ror(uint lua_v, int amt) public uint bit_ror(object lua_v, object amt)
{ {
return (uint) ((lua_v >> amt) | (lua_v << (32 - amt))); return ((uint) lua_v >> (int) amt) | ((uint) lua_v << (32 - (int) amt));
} }
public uint bit_bor(uint lua_v, uint amt) public uint bit_bor(object lua_v, object amt)
{ {
return lua_v | amt; return (uint) ((uint) lua_v | (int) amt);
} }
public uint bit_bxor(uint lua_v, uint amt) public uint bit_bxor(object lua_v, object amt)
{ {
return lua_v ^ amt; return (uint) ((uint) lua_v ^ (int) amt);
} }
public uint bit_bnot(uint lua_v) public uint bit_bnot(object lua_v)
{ {
return ~ lua_v; return ~ (uint) lua_v;
} }
//---------------------------------------------------- //----------------------------------------------------