mirror of
https://github.com/scummvm/scummvm.git
synced 2026-06-20 05:45:29 +00:00
AGS: Run astyle formatting
This commit is contained in:
dreammaster
committed by
Paul Gilbert
Paul Gilbert
parent
8f6391bb5b
commit
8026e4bb30
@@ -47,93 +47,76 @@
|
||||
|
||||
extern ccInstance *current_instance; // in script/cc_instance
|
||||
|
||||
bool ccAddExternalStaticFunction(const String &name, ScriptAPIFunction *pfn)
|
||||
{
|
||||
return simp.add(name, RuntimeScriptValue().SetStaticFunction(pfn), nullptr) == 0;
|
||||
bool ccAddExternalStaticFunction(const String &name, ScriptAPIFunction *pfn) {
|
||||
return simp.add(name, RuntimeScriptValue().SetStaticFunction(pfn), nullptr) == 0;
|
||||
}
|
||||
|
||||
bool ccAddExternalPluginFunction(const String &name, void *pfn)
|
||||
{
|
||||
return simp.add(name, RuntimeScriptValue().SetPluginFunction(pfn), nullptr) == 0;
|
||||
bool ccAddExternalPluginFunction(const String &name, void *pfn) {
|
||||
return simp.add(name, RuntimeScriptValue().SetPluginFunction(pfn), nullptr) == 0;
|
||||
}
|
||||
|
||||
bool ccAddExternalStaticObject(const String &name, void *ptr, ICCStaticObject *manager)
|
||||
{
|
||||
return simp.add(name, RuntimeScriptValue().SetStaticObject(ptr, manager), nullptr) == 0;
|
||||
bool ccAddExternalStaticObject(const String &name, void *ptr, ICCStaticObject *manager) {
|
||||
return simp.add(name, RuntimeScriptValue().SetStaticObject(ptr, manager), nullptr) == 0;
|
||||
}
|
||||
|
||||
bool ccAddExternalStaticArray(const String &name, void *ptr, StaticArray *array_mgr)
|
||||
{
|
||||
return simp.add(name, RuntimeScriptValue().SetStaticArray(ptr, array_mgr), nullptr) == 0;
|
||||
bool ccAddExternalStaticArray(const String &name, void *ptr, StaticArray *array_mgr) {
|
||||
return simp.add(name, RuntimeScriptValue().SetStaticArray(ptr, array_mgr), nullptr) == 0;
|
||||
}
|
||||
|
||||
bool ccAddExternalDynamicObject(const String &name, void *ptr, ICCDynamicObject *manager)
|
||||
{
|
||||
return simp.add(name, RuntimeScriptValue().SetDynamicObject(ptr, manager), nullptr) == 0;
|
||||
bool ccAddExternalDynamicObject(const String &name, void *ptr, ICCDynamicObject *manager) {
|
||||
return simp.add(name, RuntimeScriptValue().SetDynamicObject(ptr, manager), nullptr) == 0;
|
||||
}
|
||||
|
||||
bool ccAddExternalObjectFunction(const String &name, ScriptAPIObjectFunction *pfn)
|
||||
{
|
||||
return simp.add(name, RuntimeScriptValue().SetObjectFunction(pfn), nullptr) == 0;
|
||||
bool ccAddExternalObjectFunction(const String &name, ScriptAPIObjectFunction *pfn) {
|
||||
return simp.add(name, RuntimeScriptValue().SetObjectFunction(pfn), nullptr) == 0;
|
||||
}
|
||||
|
||||
bool ccAddExternalScriptSymbol(const String &name, const RuntimeScriptValue &prval, ccInstance *inst)
|
||||
{
|
||||
return simp.add(name, prval, inst) == 0;
|
||||
bool ccAddExternalScriptSymbol(const String &name, const RuntimeScriptValue &prval, ccInstance *inst) {
|
||||
return simp.add(name, prval, inst) == 0;
|
||||
}
|
||||
|
||||
void ccRemoveExternalSymbol(const String &name)
|
||||
{
|
||||
simp.remove(name);
|
||||
void ccRemoveExternalSymbol(const String &name) {
|
||||
simp.remove(name);
|
||||
}
|
||||
|
||||
void ccRemoveAllSymbols()
|
||||
{
|
||||
simp.clear();
|
||||
void ccRemoveAllSymbols() {
|
||||
simp.clear();
|
||||
}
|
||||
|
||||
ccInstance *loadedInstances[MAX_LOADED_INSTANCES] = {nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr};
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
|
||||
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr
|
||||
};
|
||||
|
||||
void nullfree(void *data)
|
||||
{
|
||||
if (data != nullptr)
|
||||
free(data);
|
||||
void nullfree(void *data) {
|
||||
if (data != nullptr)
|
||||
free(data);
|
||||
}
|
||||
|
||||
void *ccGetSymbolAddress(const String &name)
|
||||
{
|
||||
const ScriptImport *import = simp.getByName(name);
|
||||
if (import)
|
||||
{
|
||||
return import->Value.Ptr;
|
||||
}
|
||||
return nullptr;
|
||||
void *ccGetSymbolAddress(const String &name) {
|
||||
const ScriptImport *import = simp.getByName(name);
|
||||
if (import) {
|
||||
return import->Value.Ptr;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
bool ccAddExternalFunctionForPlugin(const String &name, void *pfn)
|
||||
{
|
||||
return simp_for_plugin.add(name, RuntimeScriptValue().SetPluginFunction(pfn), nullptr) == 0;
|
||||
bool ccAddExternalFunctionForPlugin(const String &name, void *pfn) {
|
||||
return simp_for_plugin.add(name, RuntimeScriptValue().SetPluginFunction(pfn), nullptr) == 0;
|
||||
}
|
||||
|
||||
void *ccGetSymbolAddressForPlugin(const String &name)
|
||||
{
|
||||
const ScriptImport *import = simp_for_plugin.getByName(name);
|
||||
if (import)
|
||||
{
|
||||
return import->Value.Ptr;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Also search the internal symbol table for non-function symbols
|
||||
import = simp.getByName(name);
|
||||
if (import)
|
||||
{
|
||||
return import->Value.Ptr;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
void *ccGetSymbolAddressForPlugin(const String &name) {
|
||||
const ScriptImport *import = simp_for_plugin.getByName(name);
|
||||
if (import) {
|
||||
return import->Value.Ptr;
|
||||
} else {
|
||||
// Also search the internal symbol table for non-function symbols
|
||||
import = simp.getByName(name);
|
||||
if (import) {
|
||||
return import->Value.Ptr;
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
new_line_hook_type new_line_hook = nullptr;
|
||||
@@ -144,158 +127,140 @@ int maxWhileLoops = 0;
|
||||
// If a while loop does this many iterations without the
|
||||
// NofityScriptAlive function getting called, the script
|
||||
// aborts. Set to 0 to disable.
|
||||
void ccSetScriptAliveTimer (int numloop) {
|
||||
maxWhileLoops = numloop;
|
||||
void ccSetScriptAliveTimer(int numloop) {
|
||||
maxWhileLoops = numloop;
|
||||
}
|
||||
|
||||
void ccNotifyScriptStillAlive () {
|
||||
if (current_instance != nullptr)
|
||||
current_instance->flags |= INSTF_RUNNING;
|
||||
void ccNotifyScriptStillAlive() {
|
||||
if (current_instance != nullptr)
|
||||
current_instance->flags |= INSTF_RUNNING;
|
||||
}
|
||||
|
||||
void ccSetDebugHook(new_line_hook_type jibble)
|
||||
{
|
||||
new_line_hook = jibble;
|
||||
void ccSetDebugHook(new_line_hook_type jibble) {
|
||||
new_line_hook = jibble;
|
||||
}
|
||||
|
||||
int call_function(intptr_t addr, const RuntimeScriptValue *object, int numparm, const RuntimeScriptValue *parms)
|
||||
{
|
||||
if (!addr)
|
||||
{
|
||||
cc_error("null function pointer in call_function");
|
||||
return -1;
|
||||
}
|
||||
if (numparm > 0 && !parms)
|
||||
{
|
||||
cc_error("invalid parameters array in call_function");
|
||||
return -1;
|
||||
}
|
||||
int call_function(intptr_t addr, const RuntimeScriptValue *object, int numparm, const RuntimeScriptValue *parms) {
|
||||
if (!addr) {
|
||||
cc_error("null function pointer in call_function");
|
||||
return -1;
|
||||
}
|
||||
if (numparm > 0 && !parms) {
|
||||
cc_error("invalid parameters array in call_function");
|
||||
return -1;
|
||||
}
|
||||
|
||||
intptr_t parm_value[9];
|
||||
if (object)
|
||||
{
|
||||
parm_value[0] = (intptr_t)object->GetPtrWithOffset();
|
||||
numparm++;
|
||||
}
|
||||
intptr_t parm_value[9];
|
||||
if (object) {
|
||||
parm_value[0] = (intptr_t)object->GetPtrWithOffset();
|
||||
numparm++;
|
||||
}
|
||||
|
||||
for (int ival = object ? 1 : 0, iparm = 0; ival < numparm; ++ival, ++iparm)
|
||||
{
|
||||
switch (parms[iparm].Type)
|
||||
{
|
||||
case kScValInteger:
|
||||
case kScValFloat: // AGS passes floats, copying their values into long variable
|
||||
case kScValPluginArg:
|
||||
parm_value[ival] = (intptr_t)parms[iparm].IValue;
|
||||
break;
|
||||
break;
|
||||
default:
|
||||
parm_value[ival] = (intptr_t)parms[iparm].GetPtrWithOffset();
|
||||
break;
|
||||
}
|
||||
}
|
||||
for (int ival = object ? 1 : 0, iparm = 0; ival < numparm; ++ival, ++iparm) {
|
||||
switch (parms[iparm].Type) {
|
||||
case kScValInteger:
|
||||
case kScValFloat: // AGS passes floats, copying their values into long variable
|
||||
case kScValPluginArg:
|
||||
parm_value[ival] = (intptr_t)parms[iparm].IValue;
|
||||
break;
|
||||
break;
|
||||
default:
|
||||
parm_value[ival] = (intptr_t)parms[iparm].GetPtrWithOffset();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// AN IMPORTANT NOTE ON PARAM TYPE
|
||||
// of 2012-11-10
|
||||
//
|
||||
//// NOTE of 2012-12-20:
|
||||
//// Everything said below is applicable only for calling
|
||||
//// exported plugin functions.
|
||||
//
|
||||
// Here we are sending parameters of type intptr_t to registered
|
||||
// function of unknown kind. Intptr_t is 32-bit for x32 build and
|
||||
// 64-bit for x64 build.
|
||||
// The exported functions usually have two types of parameters:
|
||||
// pointer and 'int' (32-bit). For x32 build those two have the
|
||||
// same size, but for x64 build first has 64-bit size while the
|
||||
// second remains 32-bit.
|
||||
// In formal case that would cause 'overflow' - function will
|
||||
// receive more data than needed (written to stack), with some
|
||||
// values shifted further by 32 bits.
|
||||
//
|
||||
// Upon testing, however, it was revealed that AMD64 processor,
|
||||
// the only platform we support x64 Linux AGS build on right now,
|
||||
// treats all the function parameters pushed to stack as 64-bit
|
||||
// values (few first parameters are sent via registers, and hence
|
||||
// are least concern anyway). Therefore, no 'overflow' occurs,
|
||||
// and 64-bit values are being effectively truncated to 32-bit
|
||||
// integers in the callee.
|
||||
//
|
||||
// Since this is still quite unreliable, this should be
|
||||
// reimplemented when there's enough free time available for
|
||||
// developers both for coding & testing.
|
||||
//
|
||||
// Most basic idea is to pass array of RuntimeScriptValue
|
||||
// objects (that hold type description) and get same RSV as a
|
||||
// return result. Keep in mind, though, that this solution will
|
||||
// require fixing ALL exported functions, so a good amount of
|
||||
// time and energy should be allocated for this task.
|
||||
//
|
||||
//
|
||||
// AN IMPORTANT NOTE ON PARAM TYPE
|
||||
// of 2012-11-10
|
||||
//
|
||||
//// NOTE of 2012-12-20:
|
||||
//// Everything said below is applicable only for calling
|
||||
//// exported plugin functions.
|
||||
//
|
||||
// Here we are sending parameters of type intptr_t to registered
|
||||
// function of unknown kind. Intptr_t is 32-bit for x32 build and
|
||||
// 64-bit for x64 build.
|
||||
// The exported functions usually have two types of parameters:
|
||||
// pointer and 'int' (32-bit). For x32 build those two have the
|
||||
// same size, but for x64 build first has 64-bit size while the
|
||||
// second remains 32-bit.
|
||||
// In formal case that would cause 'overflow' - function will
|
||||
// receive more data than needed (written to stack), with some
|
||||
// values shifted further by 32 bits.
|
||||
//
|
||||
// Upon testing, however, it was revealed that AMD64 processor,
|
||||
// the only platform we support x64 Linux AGS build on right now,
|
||||
// treats all the function parameters pushed to stack as 64-bit
|
||||
// values (few first parameters are sent via registers, and hence
|
||||
// are least concern anyway). Therefore, no 'overflow' occurs,
|
||||
// and 64-bit values are being effectively truncated to 32-bit
|
||||
// integers in the callee.
|
||||
//
|
||||
// Since this is still quite unreliable, this should be
|
||||
// reimplemented when there's enough free time available for
|
||||
// developers both for coding & testing.
|
||||
//
|
||||
// Most basic idea is to pass array of RuntimeScriptValue
|
||||
// objects (that hold type description) and get same RSV as a
|
||||
// return result. Keep in mind, though, that this solution will
|
||||
// require fixing ALL exported functions, so a good amount of
|
||||
// time and energy should be allocated for this task.
|
||||
//
|
||||
|
||||
switch (numparm)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
int (*fparam) ();
|
||||
fparam = (int (*)())addr;
|
||||
return fparam();
|
||||
}
|
||||
case 1:
|
||||
{
|
||||
int (*fparam) (intptr_t);
|
||||
fparam = (int (*)(intptr_t))addr;
|
||||
return fparam(parm_value[0]);
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
int (*fparam) (intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1]);
|
||||
}
|
||||
case 3:
|
||||
{
|
||||
int (*fparam) (intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2]);
|
||||
}
|
||||
case 4:
|
||||
{
|
||||
int (*fparam) (intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3]);
|
||||
}
|
||||
case 5:
|
||||
{
|
||||
int (*fparam) (intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3], parm_value[4]);
|
||||
}
|
||||
case 6:
|
||||
{
|
||||
int (*fparam) (intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3], parm_value[4], parm_value[5]);
|
||||
}
|
||||
case 7:
|
||||
{
|
||||
int (*fparam) (intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3], parm_value[4], parm_value[5], parm_value[6]);
|
||||
}
|
||||
case 8:
|
||||
{
|
||||
int (*fparam) (intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3], parm_value[4], parm_value[5], parm_value[6], parm_value[7]);
|
||||
}
|
||||
case 9:
|
||||
{
|
||||
int (*fparam) (intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3], parm_value[4], parm_value[5], parm_value[6], parm_value[7], parm_value[8]);
|
||||
}
|
||||
}
|
||||
switch (numparm) {
|
||||
case 0: {
|
||||
int (*fparam)();
|
||||
fparam = (int (*)())addr;
|
||||
return fparam();
|
||||
}
|
||||
case 1: {
|
||||
int (*fparam)(intptr_t);
|
||||
fparam = (int (*)(intptr_t))addr;
|
||||
return fparam(parm_value[0]);
|
||||
}
|
||||
case 2: {
|
||||
int (*fparam)(intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1]);
|
||||
}
|
||||
case 3: {
|
||||
int (*fparam)(intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2]);
|
||||
}
|
||||
case 4: {
|
||||
int (*fparam)(intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3]);
|
||||
}
|
||||
case 5: {
|
||||
int (*fparam)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3], parm_value[4]);
|
||||
}
|
||||
case 6: {
|
||||
int (*fparam)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3], parm_value[4], parm_value[5]);
|
||||
}
|
||||
case 7: {
|
||||
int (*fparam)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3], parm_value[4], parm_value[5], parm_value[6]);
|
||||
}
|
||||
case 8: {
|
||||
int (*fparam)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3], parm_value[4], parm_value[5], parm_value[6], parm_value[7]);
|
||||
}
|
||||
case 9: {
|
||||
int (*fparam)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t);
|
||||
fparam = (int (*)(intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t, intptr_t))addr;
|
||||
return fparam(parm_value[0], parm_value[1], parm_value[2], parm_value[3], parm_value[4], parm_value[5], parm_value[6], parm_value[7], parm_value[8]);
|
||||
}
|
||||
}
|
||||
|
||||
cc_error("too many arguments in call to function");
|
||||
return -1;
|
||||
cc_error("too many arguments in call to function");
|
||||
return -1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user