diff options
123 files changed, 967 insertions, 964 deletions
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp index 3c590a0d49..4e868eb5a1 100644 --- a/indra/llcommon/llfile.cpp +++ b/indra/llcommon/llfile.cpp @@ -160,7 +160,7 @@ LLFILE * LLFile::_Fiopen(const char *filename, std::ios::openmode mode,int) // p | ios_base::binary, 0}; - FILE *fp = 0; + LLFILE *fp = 0; int n; ios_base::openmode atendflag = mode & ios_base::ate; ios_base::openmode norepflag = mode & ios_base::_Noreplace; @@ -207,7 +207,7 @@ void llifstream::open(const char* _Filename, /* Flawfinder: ignore */ int _Prot) { // open a C stream with specified mode - FILE* filep = LLFile::_Fiopen(_Filename,_Mode | ios_base::in, _Prot); + LLFILE* filep = LLFile::_Fiopen(_Filename,_Mode | ios_base::in, _Prot); if(filep == NULL) { _Myios::setstate(ios_base::failbit); /*Flawfinder: ignore*/ @@ -258,7 +258,7 @@ void llofstream::open(const char* _Filename, /* Flawfinder: ignore */ int _Prot) { // open a C stream with specified mode - FILE* filep = LLFile::_Fiopen(_Filename,_Mode | ios_base::out, _Prot); + LLFILE* filep = LLFile::_Fiopen(_Filename,_Mode | ios_base::out, _Prot); if(filep == NULL) { _Myios::setstate(ios_base::failbit); /*Flawfinder: ignore*/ diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h index da1ad6a34e..a8a6965c0d 100644 --- a/indra/llcommon/llfile.h +++ b/indra/llcommon/llfile.h @@ -42,6 +42,8 @@ typedef FILE LLFILE; +#include <fstream> + #ifdef LL_WINDOWS #define USE_LLFILESTREAMS 1 #else diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp index e52a137254..079f2b3258 100644 --- a/indra/llcommon/llmemory.cpp +++ b/indra/llcommon/llmemory.cpp @@ -387,7 +387,7 @@ U64 getCurrentRSS() U64 getCurrentRSS() { static const char statPath[] = "/proc/self/stat"; - FILE *fp = fopen(statPath, "r"); + LLFILE *fp = LLFile::fopen(statPath, "r"); U64 rss = 0; if (fp == NULL) diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp index 4977ead91c..29a3cf32a8 100644 --- a/indra/llcommon/llprocessor.cpp +++ b/indra/llcommon/llprocessor.cpp @@ -2230,7 +2230,7 @@ bool CProcessor::WriteInfoTextFile(const char *strFilename) return false; // Then we create a new file (CREATE_ALWAYS) - FILE *file = LLFile::fopen(strFilename, "w"); /* Flawfinder: ignore */ + LLFILE *file = LLFile::fopen(strFilename, "w"); /* Flawfinder: ignore */ if (!file) return false; diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 98393dacd1..8700d9681e 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -293,7 +293,7 @@ U32 LLOSInfo::getProcessVirtualSizeKB() #if LL_WINDOWS #endif #if LL_LINUX - FILE* status_filep = LLFile::fopen("/proc/self/status", "rb"); + LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb"); S32 numRead = 0; char buff[STATUS_SIZE]; /* Flawfinder: ignore */ @@ -336,7 +336,7 @@ U32 LLOSInfo::getProcessResidentSizeKB() #if LL_WINDOWS #endif #if LL_LINUX - FILE* status_filep = LLFile::fopen("/proc/self/status", "rb"); + LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb"); if (status_filep != NULL) { S32 numRead = 0; @@ -398,7 +398,7 @@ LLCPUInfo::LLCPUInfo() #elif LL_LINUX std::map< LLString, LLString > cpuinfo; - FILE* cpuinfo_fp = LLFile::fopen(CPUINFO_FILE, "rb"); + LLFILE* cpuinfo_fp = LLFile::fopen(CPUINFO_FILE, "rb"); if(cpuinfo_fp) { char line[MAX_STRING]; @@ -486,7 +486,7 @@ void LLCPUInfo::stream(std::ostream& s) const } #else // *NOTE: This works on linux. What will it do on other systems? - FILE* cpuinfo = LLFile::fopen(CPUINFO_FILE, "rb"); + LLFILE* cpuinfo = LLFile::fopen(CPUINFO_FILE, "rb"); if(cpuinfo) { char line[MAX_STRING]; @@ -621,7 +621,7 @@ void LLMemoryInfo::stream(std::ostream& s) const s << "Total Physical KB: " << phys << std::endl; #else // *NOTE: This works on linux. What will it do on other systems? - FILE* meminfo = LLFile::fopen(MEMINFO_FILE,"rb"); + LLFILE* meminfo = LLFile::fopen(MEMINFO_FILE,"rb"); if(meminfo) { char line[MAX_STRING]; /* Flawfinder: ignore */ @@ -665,7 +665,7 @@ BOOL gunzip_file(const char *srcfile, const char *dstfile) BOOL retval = FALSE; gzFile src = NULL; U8 buffer[UNCOMPRESS_BUFFER_SIZE]; - FILE *dst = NULL; + LLFILE *dst = NULL; S32 bytes = 0; (void *) strcpy(tmpfile, dstfile); /* Flawfinder: ignore */ (void *) strncat(tmpfile, ".t", sizeof(tmpfile) - strlen(tmpfile) -1); /* Flawfinder: ignore */ @@ -700,7 +700,7 @@ BOOL gzip_file(const char *srcfile, const char *dstfile) BOOL retval = FALSE; U8 buffer[COMPRESS_BUFFER_SIZE]; gzFile dst = NULL; - FILE *src = NULL; + LLFILE *src = NULL; S32 bytes = 0; (void *) strcpy(tmpfile, dstfile); /* Flawfinder: ignore */ (void *) strncat(tmpfile, ".t", sizeof(tmpfile) - strlen(tmpfile) -1); /* Flawfinder: ignore */ diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp index 805297f8ee..69a32975a0 100644 --- a/indra/llimage/llimagetga.cpp +++ b/indra/llimage/llimagetga.cpp @@ -1128,7 +1128,7 @@ bool LLImageTGA::loadFile( const LLString& path ) return false; } - FILE* file = LLFile::fopen(path.c_str(), "rb"); /* Flawfinder: ignore */ + LLFILE* file = LLFile::fopen(path.c_str(), "rb"); /* Flawfinder: ignore */ if( !file ) { llwarns << "Couldn't open file " << path << llendl; diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index dfc5d4520b..c71ba1b3c2 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -58,14 +58,14 @@ void fallbackDestroyLLImageJ2CImpl(LLImageJ2CImpl* impl) } /** -sample error callback expecting a FILE* client object +sample error callback expecting a LLFILE* client object */ void error_callback(const char* msg, void*) { lldebugs << "LLImageJ2CImpl error_callback: " << msg << llendl; } /** -sample warning callback expecting a FILE* client object +sample warning callback expecting a LLFILE* client object */ void warning_callback(const char* msg, void*) { diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 686524b7da..0b28c70965 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -217,7 +217,7 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream) // exportFile should be replaced with exportLegacyStream // not sure whether exportLegacyStream(llofstream(fp)) would work, fp may need to get icramented... -BOOL LLInventoryObject::exportFile(FILE* fp, BOOL) const +BOOL LLInventoryObject::exportFile(LLFILE* fp, BOOL) const { char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ fprintf(fp, "\tinv_object\t0\n\t{\n"); @@ -520,7 +520,7 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32 } // virtual -BOOL LLInventoryItem::importFile(FILE* fp) +BOOL LLInventoryItem::importFile(LLFILE* fp) { // *NOTE: Changing the buffer size will require changing the scanf // calls below. @@ -674,7 +674,7 @@ BOOL LLInventoryItem::importFile(FILE* fp) return success; } -BOOL LLInventoryItem::exportFile(FILE* fp, BOOL include_asset_key) const +BOOL LLInventoryItem::exportFile(LLFILE* fp, BOOL include_asset_key) const { char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ fprintf(fp, "\tinv_item\t0\n\t{\n"); @@ -1429,7 +1429,7 @@ void LLInventoryCategory::unpackMessage(LLMessageSystem* msg, } // virtual -BOOL LLInventoryCategory::importFile(FILE* fp) +BOOL LLInventoryCategory::importFile(LLFILE* fp) { // *NOTE: Changing the buffer size will require changing the scanf // calls below. @@ -1495,7 +1495,7 @@ BOOL LLInventoryCategory::importFile(FILE* fp) return TRUE; } -BOOL LLInventoryCategory::exportFile(FILE* fp, BOOL) const +BOOL LLInventoryCategory::exportFile(LLFILE* fp, BOOL) const { char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ fprintf(fp, "\tinv_category\t0\n\t{\n"); diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 8b579ec306..6a743e2bbd 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -101,8 +101,8 @@ public: // file support - implemented here so that a minimal information // set can be transmitted between simulator and viewer. -// virtual BOOL importFile(FILE* fp); - virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const; +// virtual BOOL importFile(LLFILE* fp); + virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const; virtual BOOL importLegacyStream(std::istream& input_stream); virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; @@ -259,8 +259,8 @@ public: // we want to detect network mangling somehow. virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0); // file support - virtual BOOL importFile(FILE* fp); - virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const; + virtual BOOL importFile(LLFILE* fp); + virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const; virtual BOOL importLegacyStream(std::istream& input_stream); virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; @@ -319,8 +319,8 @@ public: bool fromLLSD(LLSD& sd); // file support - virtual BOOL importFile(FILE* fp); - virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const; + virtual BOOL importFile(LLFILE* fp); + virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const; virtual BOOL importLegacyStream(std::istream& input_stream); virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp index f816d54181..1788fedf50 100644 --- a/indra/llinventory/llpermissions.cpp +++ b/indra/llinventory/llpermissions.cpp @@ -544,7 +544,7 @@ void LLPermissions::unpackMessage(LLMessageSystem* msg, const char* block, S32 b // File support // -BOOL LLPermissions::importFile(FILE* fp) +BOOL LLPermissions::importFile(LLFILE* fp) { init(LLUUID::null, LLUUID::null, LLUUID::null, LLUUID::null); const S32 BUFSIZE = 16384; @@ -648,7 +648,7 @@ BOOL LLPermissions::importFile(FILE* fp) } -BOOL LLPermissions::exportFile(FILE* fp) const +BOOL LLPermissions::exportFile(LLFILE* fp) const { char uuid_str[256]; /* Flawfinder: ignore */ diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h index 36acc438be..6f88186700 100644 --- a/indra/llinventory/llpermissions.h +++ b/indra/llinventory/llpermissions.h @@ -302,8 +302,8 @@ public: void unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0); // Load/save support - BOOL importFile(FILE* fp); - BOOL exportFile(FILE* fp) const; + BOOL importFile(LLFILE* fp); + BOOL exportFile(LLFILE* fp) const; BOOL importLegacyStream(std::istream& input_stream); BOOL exportLegacyStream(std::ostream& output_stream) const; diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp index c268544955..0c2ba82302 100644 --- a/indra/llinventory/llsaleinfo.cpp +++ b/indra/llinventory/llsaleinfo.cpp @@ -84,7 +84,7 @@ U32 LLSaleInfo::getCRC32() const } -BOOL LLSaleInfo::exportFile(FILE* fp) const +BOOL LLSaleInfo::exportFile(LLFILE* fp) const { fprintf(fp, "\tsale_info\t0\n\t{\n"); fprintf(fp, "\t\tsale_type\t%s\n", lookup(mSaleType)); @@ -158,7 +158,7 @@ BOOL LLSaleInfo::importXML(LLXMLNode* node) return success; } -BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask) +BOOL LLSaleInfo::importFile(LLFILE* fp, BOOL& has_perm_mask, U32& perm_mask) { has_perm_mask = FALSE; diff --git a/indra/llinventory/llsaleinfo.h b/indra/llinventory/llsaleinfo.h index 1c9db6e346..e9753cdfba 100644 --- a/indra/llinventory/llsaleinfo.h +++ b/indra/llinventory/llsaleinfo.h @@ -91,8 +91,8 @@ public: // file serialization - BOOL exportFile(FILE* fp) const; - BOOL importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask); + BOOL exportFile(LLFILE* fp) const; + BOOL importFile(LLFILE* fp, BOOL& has_perm_mask, U32& perm_mask); BOOL exportLegacyStream(std::ostream& output_stream) const; LLSD asLLSD() const; diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index f4052f336f..e34c866a80 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -770,7 +770,7 @@ BOOL LLProfile::generate(const LLProfileParams& params, BOOL path_open,F32 detai -BOOL LLProfileParams::importFile(FILE *fp) +BOOL LLProfileParams::importFile(LLFILE *fp) { LLMemType m1(LLMemType::MTYPE_VOLUME); @@ -834,7 +834,7 @@ BOOL LLProfileParams::importFile(FILE *fp) } -BOOL LLProfileParams::exportFile(FILE *fp) const +BOOL LLProfileParams::exportFile(LLFILE *fp) const { fprintf(fp,"\t\tprofile 0\n"); fprintf(fp,"\t\t{\n"); @@ -1282,7 +1282,7 @@ BOOL LLDynamicPath::generate(const LLPathParams& params, F32 detail, S32 split, } -BOOL LLPathParams::importFile(FILE *fp) +BOOL LLPathParams::importFile(LLFILE *fp) { LLMemType m1(LLMemType::MTYPE_VOLUME); @@ -1403,7 +1403,7 @@ BOOL LLPathParams::importFile(FILE *fp) } -BOOL LLPathParams::exportFile(FILE *fp) const +BOOL LLPathParams::exportFile(LLFILE *fp) const { fprintf(fp, "\t\tpath 0\n"); fprintf(fp, "\t\t{\n"); @@ -3777,7 +3777,7 @@ BOOL LLVolume::cleanupTriangleData( const S32 num_input_vertices, } -BOOL LLVolumeParams::importFile(FILE *fp) +BOOL LLVolumeParams::importFile(LLFILE *fp) { LLMemType m1(LLMemType::MTYPE_VOLUME); @@ -3822,7 +3822,7 @@ BOOL LLVolumeParams::importFile(FILE *fp) return TRUE; } -BOOL LLVolumeParams::exportFile(FILE *fp) const +BOOL LLVolumeParams::exportFile(LLFILE *fp) const { fprintf(fp,"\tshape 0\n"); fprintf(fp,"\t{\n"); diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index 11a7c2f1c6..91415ee036 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -52,6 +52,7 @@ class LLVolume; #include "llstrider.h" #include "v4coloru.h" #include "llmemory.h" +#include "llfile.h" //============================================================================ @@ -229,8 +230,8 @@ public: void copyParams(const LLProfileParams ¶ms); - BOOL importFile(FILE *fp); - BOOL exportFile(FILE *fp) const; + BOOL importFile(LLFILE *fp); + BOOL exportFile(LLFILE *fp) const; BOOL importLegacyStream(std::istream& input_stream); BOOL exportLegacyStream(std::ostream& output_stream) const; @@ -354,8 +355,8 @@ public: void copyParams(const LLPathParams ¶ms); - BOOL importFile(FILE *fp); - BOOL exportFile(FILE *fp) const; + BOOL importFile(LLFILE *fp); + BOOL exportFile(LLFILE *fp) const; BOOL importLegacyStream(std::istream& input_stream); BOOL exportLegacyStream(std::ostream& output_stream) const; @@ -545,8 +546,8 @@ public: const LLPathParams &getPathParams() const {return mPathParams;} LLPathParams &getPathParams() {return mPathParams;} - BOOL importFile(FILE *fp); - BOOL exportFile(FILE *fp) const; + BOOL importFile(LLFILE *fp); + BOOL exportFile(LLFILE *fp) const; BOOL importLegacyStream(std::istream& input_stream); BOOL exportLegacyStream(std::ostream& output_stream) const; diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp index e2043144b8..1f4ea70d95 100644 --- a/indra/llmessage/llassetstorage.cpp +++ b/indra/llmessage/llassetstorage.cpp @@ -1242,7 +1242,7 @@ void LLAssetStorage::legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAss uuid.toString(uuid_str); snprintf(filename,sizeof(filename),"%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type)); /* Flawfinder: ignore */ - FILE* fp = LLFile::fopen(filename, "wb"); /* Flawfinder: ignore */ + LLFILE* fp = LLFile::fopen(filename, "wb"); /* Flawfinder: ignore */ if (fp) { const S32 buf_size = 65536; diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index d482011194..1ad5179455 100644 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -323,7 +323,7 @@ void LLCacheName::cancelCallback(const LLUUID& id, LLCacheNameCallback callback, } } -void LLCacheName::importFile(FILE* fp) +void LLCacheName::importFile(LLFILE* fp) { S32 count = 0; diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h index d9518e0f91..5dfde80622 100644 --- a/indra/llmessage/llcachename.h +++ b/indra/llmessage/llcachename.h @@ -64,7 +64,7 @@ public: void cancelCallback(const LLUUID& id, LLCacheNameCallback callback, void* user_data = NULL); // janky old format. Remove after a while. Phoenix. 2008-01-30 - void importFile(FILE* fp); + void importFile(LLFILE* fp); // storing cache on disk; for viewer, in name.cache bool importFile(std::istream& istr); diff --git a/indra/llmessage/lldatapacker.h b/indra/llmessage/lldatapacker.h index ff33d4ecc2..d6d1f5c1da 100644 --- a/indra/llmessage/lldatapacker.h +++ b/indra/llmessage/lldatapacker.h @@ -330,7 +330,7 @@ inline BOOL LLDataPackerAsciiBuffer::verifyLength(const S32 data_size, const cha class LLDataPackerAsciiFile : public LLDataPacker { public: - LLDataPackerAsciiFile(FILE *fp, const S32 indent = 2) + LLDataPackerAsciiFile(LLFILE *fp, const S32 indent = 2) : LLDataPacker(), mIndent(indent), mFP(fp), @@ -407,7 +407,7 @@ protected: protected: S32 mIndent; - FILE *mFP; + LLFILE *mFP; std::ostream* mOutputStream; std::istream* mInputStream; }; diff --git a/indra/llmessage/lltransfersourcefile.h b/indra/llmessage/lltransfersourcefile.h index c3523b10d7..84a6bd259f 100644 --- a/indra/llmessage/lltransfersourcefile.h +++ b/indra/llmessage/lltransfersourcefile.h @@ -74,7 +74,7 @@ protected: protected: LLTransferSourceParamsFile mParams; - FILE *mFP; + LLFILE *mFP; }; #endif // LL_LLTRANSFERSOURCEFILE_H diff --git a/indra/llmessage/lltransfertargetfile.h b/indra/llmessage/lltransfertargetfile.h index 18b44e2611..6b837f4890 100644 --- a/indra/llmessage/lltransfertargetfile.h +++ b/indra/llmessage/lltransfertargetfile.h @@ -69,7 +69,7 @@ protected: LLTransferTargetParamsFile mParams; - FILE *mFP; + LLFILE *mFP; }; #endif // LL_LLTRANSFERTARGETFILE_H diff --git a/indra/llmessage/llxfer_file.cpp b/indra/llmessage/llxfer_file.cpp index caa418e564..6b71e7db8f 100644 --- a/indra/llmessage/llxfer_file.cpp +++ b/indra/llmessage/llxfer_file.cpp @@ -353,7 +353,7 @@ S32 LLXfer_File::processEOF() } else { - //FILE* fp = LLFile::fopen(mTempFilename, "r"); + //LLFILE* fp = LLFile::fopen(mTempFilename, "r"); //llwarns << "File " << mTempFilename << " does " // << (!fp ? "not" : "" ) << " exit." << llendl; //if(fp) fclose(fp); @@ -424,8 +424,8 @@ U32 LLXfer_File::getXferTypeTag() S32 copy_file(const char* from, const char* to) { S32 rv = 0; - FILE* in = LLFile::fopen(from, "rb"); /*Flawfinder: ignore*/ - FILE* out = LLFile::fopen(to, "wb"); /*Flawfinder: ignore*/ + LLFILE* in = LLFile::fopen(from, "rb"); /*Flawfinder: ignore*/ + LLFILE* out = LLFile::fopen(to, "wb"); /*Flawfinder: ignore*/ if(in && out) { S32 read = 0; diff --git a/indra/llmessage/llxfer_file.h b/indra/llmessage/llxfer_file.h index b87417d290..5302302e54 100644 --- a/indra/llmessage/llxfer_file.h +++ b/indra/llmessage/llxfer_file.h @@ -38,7 +38,7 @@ class LLXfer_File : public LLXfer { protected: - FILE *mFp; + LLFILE *mFp; char mLocalFilename[LL_MAX_PATH]; /* Flawfinder : ignore */ char mRemoteFilename[LL_MAX_PATH]; /* Flawfinder : ignore */ ELLPath mRemotePath; diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index 8d961de6c9..26678d61cc 100644 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -2419,7 +2419,7 @@ void process_deny_trusted_circuit(LLMessageSystem *msg, void **) void dump_prehash_files() { U32 i; - FILE* fp = LLFile::fopen("../../indra/llmessage/message_prehash.h", "w"); /* Flawfinder: ignore */ + LLFILE* fp = LLFile::fopen("../../indra/llmessage/message_prehash.h", "w"); /* Flawfinder: ignore */ if (fp) { fprintf( diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 4a3a64f955..1113959999 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -863,7 +863,7 @@ S32 LLFontGL::render(const LLWString &wstr, if (style & UNDERLINE) { LLGLSNoTexture no_texture; - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex2f(start_x, cur_y - (mDescender)); gGL.vertex2f(cur_x, cur_y - (mDescender)); gGL.end(); @@ -1358,7 +1358,7 @@ void LLFontGL::drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, con F32 slant_offset; slant_offset = ((style & ITALIC) ? ( -mAscender * 0.2f) : 0.f); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { //FIXME: bold and drop shadow are mutually exclusive only for convenience //Allow both when we need them. diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 99fd2b33d4..5a1079ac15 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -60,7 +60,6 @@ U32 LLVertexBuffer::sLastMask = 0; BOOL LLVertexBuffer::sVBOActive = FALSE; BOOL LLVertexBuffer::sIBOActive = FALSE; U32 LLVertexBuffer::sAllocatedBytes = 0; -BOOL LLVertexBuffer::sRenderActive = FALSE; BOOL LLVertexBuffer::sMapped = FALSE; std::vector<U32> LLVertexBuffer::sDeleteList; @@ -84,16 +83,18 @@ U32 LLVertexBuffer::sGLMode[LLVertexBuffer::NUM_MODES] = GL_TRIANGLE_FAN, GL_POINTS, GL_LINES, - GL_LINE_STRIP + GL_LINE_STRIP, + GL_QUADS, + GL_LINE_LOOP, }; //static void LLVertexBuffer::setupClientArrays(U32 data_mask) { - if (LLGLImmediate::sStarted) + /*if (LLGLImmediate::sStarted) { llerrs << "Cannot use LLGLImmediate and LLVertexBuffer simultaneously!" << llendl; - } + }*/ if (sLastMask != data_mask) { @@ -186,6 +187,11 @@ void LLVertexBuffer::drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indi llerrs << "Wrong vertex buffer bound." << llendl; } + if (mode > NUM_MODES) + { + llerrs << "Invalid draw mode: " << mode << llendl; + } + glDrawRangeElements(sGLMode[mode], start, end, count, GL_UNSIGNED_SHORT, ((U16*) getIndicesPointer()) + indices_offset); } @@ -208,10 +214,37 @@ void LLVertexBuffer::draw(U32 mode, U32 count, U32 indices_offset) const llerrs << "Wrong vertex buffer bound." << llendl; } + if (mode > NUM_MODES) + { + llerrs << "Invalid draw mode: " << mode << llendl; + } + glDrawElements(sGLMode[mode], count, GL_UNSIGNED_SHORT, ((U16*) getIndicesPointer()) + indices_offset); } +void LLVertexBuffer::drawArrays(U32 mode, U32 first, U32 count) const +{ + + if (first >= (U32) mRequestedNumVerts || + first + count > (U32) mRequestedNumVerts) + { + llerrs << "Bad vertex buffer draw range: [" << first << ", " << first+count << "]" << llendl; + } + + if (mGLBuffer != sGLRenderBuffer) + { + llerrs << "Wrong vertex buffer bound." << llendl; + } + + if (mode > NUM_MODES) + { + llerrs << "Invalid draw mode: " << mode << llendl; + } + + glDrawArrays(sGLMode[mode], first, count); +} + //static void LLVertexBuffer::initClass(bool use_vbo) { @@ -246,24 +279,8 @@ void LLVertexBuffer::unbind() void LLVertexBuffer::cleanupClass() { LLMemType mt(LLMemType::MTYPE_VERTEX_DATA); - startRender(); - stopRender(); - clientCopy(); // deletes GL buffers -} - -//static, call before rendering VBOs -void LLVertexBuffer::startRender() -{ - LLMemType mt(LLMemType::MTYPE_VERTEX_DATA); - unbind(); - sRenderActive = TRUE; -} - -void LLVertexBuffer::stopRender() -{ - unbind(); - sRenderActive = FALSE; + clientCopy(); // deletes GL buffers } void LLVertexBuffer::clientCopy(F64 max_time) @@ -717,7 +734,7 @@ BOOL LLVertexBuffer::useVBOs() const return FALSE; } #endif - return sEnableVBOs; // && (!sRenderActive || !mLocked); + return sEnableVBOs; } //---------------------------------------------------------------------------- @@ -937,6 +954,22 @@ void LLVertexBuffer::setBuffer(U32 data_mask) if (mResized) { + if (gDebugGL) + { + GLint buff; + glGetIntegerv(GL_ARRAY_BUFFER_BINDING_ARB, &buff); + if (buff != mGLBuffer) + { + llerrs << "Invalid GL vertex buffer bound: " << buff << llendl; + } + + glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, &buff); + if (buff != mGLIndices) + { + llerrs << "Invalid GL index buffer bound: " << buff << llendl; + } + } + if (mGLBuffer) { stop_glerror(); @@ -1000,10 +1033,6 @@ void LLVertexBuffer::setBuffer(U32 data_mask) sGLRenderBuffer = mGLBuffer; if (data_mask && setup) { - if (!sRenderActive) - { - llwarns << "Vertex buffer set for rendering outside of render frame." << llendl; - } setupVertexBuffer(data_mask); // subclass specific setup (virtual function) sSetCount++; } diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h index 50f79cfc9d..2b5f4e200b 100644 --- a/indra/llrender/llvertexbuffer.h +++ b/indra/llrender/llvertexbuffer.h @@ -85,9 +85,7 @@ public: static void initClass(bool use_vbo); static void cleanupClass(); static void setupClientArrays(U32 data_mask); - static void startRender(); //between start and stop render, no client copies will occur - static void stopRender(); //any buffer not copied to GL will be rendered from client memory - static void clientCopy(F64 max_time = 0.005); //copy data from client to GL + static void clientCopy(F64 max_time = 0.005); //copy data from client to GL static void unbind(); //unbind any bound vertex buffer //get the size of a vertex with the given typemask @@ -131,6 +129,8 @@ public: POINTS, LINES, LINE_STRIP, + QUADS, + LINE_LOOP, NUM_MODES }; protected: @@ -205,6 +205,7 @@ public: void markDirty(U32 vert_index, U32 vert_count, U32 indices_index, U32 indices_count); void draw(U32 mode, U32 count, U32 indices_offset) const; + void drawArrays(U32 mode, U32 offset, U32 count) const; void drawRange(U32 mode, U32 start, U32 end, U32 count, U32 indices_offset) const; protected: @@ -244,7 +245,6 @@ protected: std::vector<DirtyRegion> mDirtyRegions; //vector of dirty regions to rebuild public: - static BOOL sRenderActive; static S32 sCount; static S32 sGLCount; static S32 sMappedCount; diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index d88f4ee7c1..f7489a7512 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -152,7 +152,7 @@ void gl_draw_x(const LLRect& rect, const LLColor4& color) gGL.color4fv( color.mV ); - gGL.begin( GL_LINES ); + gGL.begin( LLVertexBuffer::LINES ); gGL.vertex2i( rect.mLeft, rect.mTop ); gGL.vertex2i( rect.mRight, rect.mBottom ); gGL.vertex2i( rect.mLeft, rect.mBottom ); @@ -193,7 +193,7 @@ void gl_rect_2d(S32 left, S32 top, S32 right, S32 bottom, BOOL filled ) // Counterclockwise quad will face the viewer if( filled ) { - gGL.begin( GL_QUADS ); + gGL.begin( LLVertexBuffer::QUADS ); gGL.vertex2i(left, top); gGL.vertex2i(left, bottom); gGL.vertex2i(right, bottom); @@ -205,7 +205,7 @@ void gl_rect_2d(S32 left, S32 top, S32 right, S32 bottom, BOOL filled ) if( gGLManager.mATIOffsetVerticalLines ) { // Work around bug in ATI driver: vertical lines are offset by (-1,-1) - gGL.begin( GL_LINES ); + gGL.begin( LLVertexBuffer::LINES ); // Verticals gGL.vertex2i(left + 1, top); @@ -228,7 +228,7 @@ void gl_rect_2d(S32 left, S32 top, S32 right, S32 bottom, BOOL filled ) { top--; right--; - gGL.begin( GL_LINE_STRIP ); + gGL.begin( LLVertexBuffer::LINE_STRIP ); gGL.vertex2i(left, top); gGL.vertex2i(left, bottom); gGL.vertex2i(right, bottom); @@ -269,7 +269,7 @@ void gl_drop_shadow(S32 left, S32 top, S32 right, S32 bottom, const LLColor4 &st LLColor4 end_color = start_color; end_color.mV[VALPHA] = 0.f; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); // Right edge, CCW faces screen gGL.color4fv(start_color.mV); @@ -331,7 +331,7 @@ void gl_line_2d(S32 x1, S32 y1, S32 x2, S32 y2 ) LLGLSNoTexture no_texture; - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex2i(x1, y1); gGL.vertex2i(x2, y2); gGL.end(); @@ -352,7 +352,7 @@ void gl_line_2d(S32 x1, S32 y1, S32 x2, S32 y2, const LLColor4 &color ) gGL.color4fv( color.mV ); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex2i(x1, y1); gGL.vertex2i(x2, y2); gGL.end(); @@ -366,11 +366,11 @@ void gl_triangle_2d(S32 x1, S32 y1, S32 x2, S32 y2, S32 x3, S32 y3, const LLColo if (filled) { - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); } else { - gGL.begin(GL_LINE_LOOP); + gGL.begin(LLVertexBuffer::LINE_LOOP); } gGL.vertex2i(x1, y1); gGL.vertex2i(x2, y2); @@ -384,7 +384,7 @@ void gl_corners_2d(S32 left, S32 top, S32 right, S32 bottom, S32 length, F32 max length = llmin((S32)(max_frac*(right - left)), length); length = llmin((S32)(max_frac*(top - bottom)), length); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex2i(left, top); gGL.vertex2i(left + length, top); @@ -515,7 +515,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLIma gGL.color4fv(color.mV); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { // draw bottom left gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom); @@ -675,7 +675,7 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre gGL.color4fv(color.mV); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop); gGL.vertex2i(width, height ); @@ -713,7 +713,7 @@ void gl_draw_scaled_image_inverted(S32 x, S32 y, S32 width, S32 height, LLImageG gGL.color4fv(color.mV); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom); gGL.vertex2i(width, height ); @@ -748,7 +748,7 @@ void gl_stippled_line_3d( const LLVector3& start, const LLVector3& end, const LL glLineWidth(2.5f); glLineStipple(2, 0x3333 << shift); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.vertex3fv( start.mV ); gGL.vertex3fv( end.mV ); @@ -765,7 +765,7 @@ void gl_rect_2d_xor(S32 left, S32 top, S32 right, S32 bottom) glLogicOp( GL_XOR ); stop_glerror(); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.vertex2i(left, top); gGL.vertex2i(left, bottom); gGL.vertex2i(right, bottom); @@ -797,14 +797,14 @@ void gl_arc_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled, F if (filled) { - gGL.begin(GL_TRIANGLE_FAN); + gGL.begin(LLVertexBuffer::TRIANGLE_FAN); gGL.vertex2f(0.f, 0.f); // make sure circle is complete steps += 1; } else { - gGL.begin(GL_LINE_STRIP); + gGL.begin(LLVertexBuffer::LINE_STRIP); } while( steps-- ) @@ -836,14 +836,14 @@ void gl_circle_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled if (filled) { - gGL.begin(GL_TRIANGLE_FAN); + gGL.begin(LLVertexBuffer::TRIANGLE_FAN); gGL.vertex2f(0.f, 0.f); // make sure circle is complete steps += 1; } else { - gGL.begin(GL_LINE_LOOP); + gGL.begin(LLVertexBuffer::LINE_LOOP); } while( steps-- ) @@ -865,7 +865,7 @@ void gl_deep_circle( F32 radius, F32 depth, S32 steps ) F32 x = radius; F32 y = 0.f; F32 angle_delta = F_TWO_PI / (F32)steps; - gGL.begin( GL_TRIANGLE_STRIP ); + gGL.begin( LLVertexBuffer::TRIANGLE_STRIP ); { S32 step = steps + 1; // An extra step to close the circle. while( step-- ) @@ -952,7 +952,7 @@ void gl_washer_2d(F32 outer_radius, F32 inner_radius, S32 steps, const LLColor4& LLGLSNoTexture gls_no_texture; - gGL.begin( GL_TRIANGLE_STRIP ); + gGL.begin( LLVertexBuffer::TRIANGLE_STRIP ); { steps += 1; // An extra step to close the circle. while( steps-- ) @@ -988,7 +988,7 @@ void gl_washer_segment_2d(F32 outer_radius, F32 inner_radius, F32 start_radians, F32 y2 = inner_radius * sin( start_radians ); LLGLSNoTexture gls_no_texture; - gGL.begin( GL_TRIANGLE_STRIP ); + gGL.begin( LLVertexBuffer::TRIANGLE_STRIP ); { steps += 1; // An extra step to close the circle. while( steps-- ) @@ -1025,7 +1025,7 @@ void gl_washer_spokes_2d(F32 outer_radius, F32 inner_radius, S32 count, const LL LLGLSNoTexture gls_no_texture; - gGL.begin( GL_LINES ); + gGL.begin( LLVertexBuffer::LINES ); { while( count-- ) { @@ -1048,7 +1048,7 @@ void gl_washer_spokes_2d(F32 outer_radius, F32 inner_radius, S32 count, const LL void gl_rect_2d_simple_tex( S32 width, S32 height ) { - gGL.begin( GL_QUADS ); + gGL.begin( LLVertexBuffer::QUADS ); gGL.texCoord2f(1.f, 1.f); gGL.vertex2i(width, height); @@ -1067,7 +1067,7 @@ void gl_rect_2d_simple_tex( S32 width, S32 height ) void gl_rect_2d_simple( S32 width, S32 height ) { - gGL.begin( GL_QUADS ); + gGL.begin( LLVertexBuffer::QUADS ); gGL.vertex2i(width, height); gGL.vertex2i(0, height); gGL.vertex2i(0, 0); @@ -1109,7 +1109,7 @@ void gl_segmented_rect_2d_tex(const S32 left, LLVector2 width_vec((F32)width, 0.f); LLVector2 height_vec(0.f, (F32)height); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { // draw bottom left gGL.texCoord2f(0.f, 0.f); @@ -1277,7 +1277,7 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left, LLVector2 x_min; LLVector2 x_max; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { if (start_fragment < middle_start) { @@ -1434,7 +1434,7 @@ void gl_segmented_rect_3d_tex(const LLVector2& border_scale, const LLVector3& bo LLVector3 bottom_border_height = ((edges & (~(U32)ROUNDED_RECT_TOP)) != 0) ? border_height : LLVector3::zero; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { // draw bottom left gGL.texCoord2f(0.f, 0.f); diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index 9db667bb51..0fafc1fecd 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1306,7 +1306,7 @@ void LLView::drawDebugRect() gGL.color4fv( border_color.mV ); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex2i(0, debug_rect.getHeight() - 1); gGL.vertex2i(0, 0); diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp index 605b7d84bc..d3559baec6 100644 --- a/indra/llui/llviewborder.cpp +++ b/indra/llui/llviewborder.cpp @@ -248,7 +248,7 @@ void LLViewBorder::drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 gGL.translatef(start_x, start_y, 0.f); glRotatef( degrees, 0, 0, 1 ); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { // width, width /---------\ length-width, width // // / \ // diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 417e48c07c..66d333ccaf 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -597,7 +597,7 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r return; } sprintf(marker, "%s.open", mDataFilename); /* Flawfinder: ignore */ - FILE* marker_fp = LLFile::fopen(marker, "w"); /* Flawfinder: ignore */ + LLFILE* marker_fp = LLFile::fopen(marker, "w"); /* Flawfinder: ignore */ if (marker_fp) { fclose(marker_fp); @@ -2134,7 +2134,7 @@ void LLVFS::dumpFiles() //============================================================================ // static -FILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock) +LLFILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock) { #if LL_WINDOWS @@ -2142,7 +2142,7 @@ FILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock) #else - FILE *fp; + LLFILE *fp; int fd; // first test the lock in a non-destructive way @@ -2192,7 +2192,7 @@ FILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock) } // static -void LLVFS::unlockAndClose(FILE *fp) +void LLVFS::unlockAndClose(LLFILE *fp) { if (fp) { diff --git a/indra/llvfs/llvfs.h b/indra/llvfs/llvfs.h index a068c0d644..8ed0afe12f 100644 --- a/indra/llvfs/llvfs.h +++ b/indra/llvfs/llvfs.h @@ -131,8 +131,8 @@ protected: void sync(LLVFSFileBlock *block, BOOL remove = FALSE); void presizeDataFile(const U32 size); - static FILE *openAndLock(const char *filename, const char *mode, BOOL read_lock); - static void unlockAndClose(FILE *fp); + static LLFILE *openAndLock(const char *filename, const char *mode, BOOL read_lock); + static void unlockAndClose(LLFILE *fp); // Can initiate LRU-based file removal to make space. // The immune file block will not be removed. @@ -153,8 +153,8 @@ protected: typedef std::multimap<U32, LLVFSBlock*> blocks_location_map_t; blocks_location_map_t mFreeBlocksByLocation; - FILE *mDataFP; - FILE *mIndexFP; + LLFILE *mDataFP; + LLFILE *mIndexFP; std::deque<S32> mIndexHoles; diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index 9b0675945d..bf9a9a14a5 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -572,7 +572,7 @@ bool LLXMLNode::parseFile( LLXMLNode* defaults_tree) { // Read file - FILE* fp = LLFile::fopen(filename.c_str(), "rb"); /* Flawfinder: ignore */ + LLFILE* fp = LLFile::fopen(filename.c_str(), "rb"); /* Flawfinder: ignore */ if (fp == NULL) { node = new LLXMLNode(); @@ -741,12 +741,12 @@ BOOL LLXMLNode::isFullyDefault() } // static -void LLXMLNode::writeHeaderToFile(FILE *fOut) +void LLXMLNode::writeHeaderToFile(LLFILE *fOut) { fprintf(fOut, "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n"); } -void LLXMLNode::writeToFile(FILE *fOut, LLString indent) +void LLXMLNode::writeToFile(LLFILE *fOut, LLString indent) { if (isFullyDefault()) { diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index d4b4a4655b..19156cf556 100644 --- a/indra/llxml/llxmlnode.h +++ b/indra/llxml/llxmlnode.h @@ -133,8 +133,8 @@ public: static bool updateNode( LLXMLNodePtr& node, LLXMLNodePtr& update_node); - static void writeHeaderToFile(FILE *fOut); - void writeToFile(FILE *fOut, LLString indent = LLString()); + static void writeHeaderToFile(LLFILE *fOut); + void writeToFile(LLFILE *fOut, LLString indent = LLString()); void writeToOstream(std::ostream& output_stream, const LLString& indent = LLString()); // Utility diff --git a/indra/llxml/llxmlparser.cpp b/indra/llxml/llxmlparser.cpp index 10e6f3f03d..5591551bb7 100644 --- a/indra/llxml/llxmlparser.cpp +++ b/indra/llxml/llxmlparser.cpp @@ -77,7 +77,7 @@ BOOL LLXmlParser::parseFile(const std::string &path) BOOL success = TRUE; - FILE* file = LLFile::fopen(path.c_str(), "rb"); /* Flawfinder: ignore */ + LLFILE* file = LLFile::fopen(path.c_str(), "rb"); /* Flawfinder: ignore */ if( !file ) { snprintf( mAuxErrorString, sizeof(mAuxErrorString), "Couldn't open file %s", path.c_str()); /* Flawfinder: ignore */ @@ -393,7 +393,7 @@ int main() { char buf[1024]; - FILE* file = LLFile::fopen("test.xml", "rb"); + LLFILE* file = LLFile::fopen("test.xml", "rb"); if( !file ) { return 1; diff --git a/indra/lscript/lscript_alloc.h b/indra/lscript/lscript_alloc.h index d90cc141f8..0fc398458e 100644 --- a/indra/lscript/lscript_alloc.h +++ b/indra/lscript/lscript_alloc.h @@ -118,7 +118,7 @@ inline void bytestream2alloc_entry(LLScriptAllocEntry &entry, U8 *buffer, S32 &o // create a heap from the HR to TM BOOL lsa_create_heap(U8 *heap_start, S32 size); -void lsa_fprint_heap(U8 *buffer, FILE *fp); +void lsa_fprint_heap(U8 *buffer, LLFILE *fp); void lsa_print_heap(U8 *buffer); diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index 03c8321d1d..3dc10fe20b 100644 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -706,7 +706,7 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename, #ifdef EMERGENCY_DEBUG_PRINTOUTS char compiled[256]; sprintf(compiled, "%s.o", src_filename); - FILE* compfile; + LLFILE* compfile; compfile = LLFile::fopen(compiled, "w"); #endif @@ -733,7 +733,7 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename, #endif #ifdef EMIT_CIL_ASSEMBLER const char* cil_output_file_name = dst_filename? dst_filename : "lscript.cil"; - FILE* cilout = LLFile::fopen(cil_output_file_name, "w"); + LLFILE* cilout = LLFile::fopen(cil_output_file_name, "w"); if(NULL == cilout) { fprintf(yyout, "Error opening cil output file %s\n", cil_output_file_name); diff --git a/indra/lscript/lscript_compile/lscript_bytecode.cpp b/indra/lscript/lscript_compile/lscript_bytecode.cpp index c41c34c5e5..5fe42fd9a8 100644 --- a/indra/lscript/lscript_compile/lscript_bytecode.cpp +++ b/indra/lscript/lscript_compile/lscript_bytecode.cpp @@ -245,7 +245,7 @@ LLScriptScriptCodeChunk::~LLScriptScriptCodeChunk() delete [] mCompleteCode; } -void LLScriptScriptCodeChunk::build(FILE *efp, FILE *bcfp) +void LLScriptScriptCodeChunk::build(LLFILE *efp, LLFILE *bcfp) { S32 code_data_size = mRegisters->mCurrentOffset + mGlobalVariables->mCurrentOffset + diff --git a/indra/lscript/lscript_compile/lscript_bytecode.h b/indra/lscript/lscript_compile/lscript_bytecode.h index 8db031af66..fcc5a23403 100644 --- a/indra/lscript/lscript_compile/lscript_bytecode.h +++ b/indra/lscript/lscript_compile/lscript_bytecode.h @@ -77,7 +77,7 @@ public: LLScriptScriptCodeChunk(S32 total_size); ~LLScriptScriptCodeChunk(); - void build(FILE *efp, FILE *bcfp); + void build(LLFILE *efp, LLFILE *bcfp); LLScriptByteCodeChunk *mRegisters; LLScriptByteCodeChunk *mGlobalVariables; diff --git a/indra/lscript/lscript_compile/lscript_error.cpp b/indra/lscript/lscript_compile/lscript_error.cpp index f4960fc541..62d36f74d7 100644 --- a/indra/lscript/lscript_compile/lscript_error.cpp +++ b/indra/lscript/lscript_compile/lscript_error.cpp @@ -40,7 +40,7 @@ S32 gInternalLine = 0; LLScriptGenerateErrorText gErrorToText; -void LLScriptFilePosition::fdotabs(FILE *fp, S32 tabs, S32 tabsize) +void LLScriptFilePosition::fdotabs(LLFILE *fp, S32 tabs, S32 tabsize) { S32 i; for (i = 0; i < tabs * tabsize; i++) @@ -75,25 +75,25 @@ char* gErrorText[LSERROR_EOF] = /*Flawfinder: ignore*/ "Declaration requires a new scope -- use { and }" }; -void LLScriptGenerateErrorText::writeWarning(FILE *fp, LLScriptFilePosition *pos, LSCRIPTWarnings warning) +void LLScriptGenerateErrorText::writeWarning(LLFILE *fp, LLScriptFilePosition *pos, LSCRIPTWarnings warning) { fprintf(fp, "(%d, %d) : WARNING : %s\n", pos->mLineNumber, pos->mColumnNumber, gWarningText[warning]); mTotalWarnings++; } -void LLScriptGenerateErrorText::writeWarning(FILE *fp, S32 line, S32 col, LSCRIPTWarnings warning) +void LLScriptGenerateErrorText::writeWarning(LLFILE *fp, S32 line, S32 col, LSCRIPTWarnings warning) { fprintf(fp, "(%d, %d) : WARNING : %s\n", line, col, gWarningText[warning]); mTotalWarnings++; } -void LLScriptGenerateErrorText::writeError(FILE *fp, LLScriptFilePosition *pos, LSCRIPTErrors error) +void LLScriptGenerateErrorText::writeError(LLFILE *fp, LLScriptFilePosition *pos, LSCRIPTErrors error) { fprintf(fp, "(%d, %d) : ERROR : %s\n", pos->mLineNumber, pos->mColumnNumber, gErrorText[error]); mTotalErrors++; } -void LLScriptGenerateErrorText::writeError(FILE *fp, S32 line, S32 col, LSCRIPTErrors error) +void LLScriptGenerateErrorText::writeError(LLFILE *fp, S32 line, S32 col, LSCRIPTErrors error) { fprintf(fp, "(%d, %d) : ERROR : %s\n", line, col, gErrorText[error]); mTotalErrors++; diff --git a/indra/lscript/lscript_compile/lscript_error.h b/indra/lscript/lscript_compile/lscript_error.h index aba3932c14..8c9e35d56b 100644 --- a/indra/lscript/lscript_compile/lscript_error.h +++ b/indra/lscript/lscript_compile/lscript_error.h @@ -84,13 +84,13 @@ public: virtual ~LLScriptFilePosition() {} - virtual void recurse(FILE *fp, S32 tabs, S32 tabsize, + virtual void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) = 0; virtual S32 getSize() = 0; - void fdotabs(FILE *fp, S32 tabs, S32 tabsize); + void fdotabs(LLFILE *fp, S32 tabs, S32 tabsize); S32 mLineNumber; S32 mColumnNumber; @@ -135,10 +135,10 @@ public: void init() { mTotalErrors = 0; mTotalWarnings = 0; } - void writeWarning(FILE *fp, LLScriptFilePosition *pos, LSCRIPTWarnings warning); - void writeWarning(FILE *fp, S32 line, S32 col, LSCRIPTWarnings warning); - void writeError(FILE *fp, LLScriptFilePosition *pos, LSCRIPTErrors error); - void writeError(FILE *fp, S32 line, S32 col, LSCRIPTErrors error); + void writeWarning(LLFILE *fp, LLScriptFilePosition *pos, LSCRIPTWarnings warning); + void writeWarning(LLFILE *fp, S32 line, S32 col, LSCRIPTWarnings warning); + void writeError(LLFILE *fp, LLScriptFilePosition *pos, LSCRIPTErrors error); + void writeError(LLFILE *fp, S32 line, S32 col, LSCRIPTErrors error); BOOL getErrors() { return mTotalErrors; } BOOL getWarnings() { return mTotalWarnings; } diff --git a/indra/lscript/lscript_compile/lscript_tree.cpp b/indra/lscript/lscript_compile/lscript_tree.cpp index cad6fc207e..f00a2e51e7 100644 --- a/indra/lscript/lscript_compile/lscript_tree.cpp +++ b/indra/lscript/lscript_compile/lscript_tree.cpp @@ -43,7 +43,7 @@ //#define LSL_INCLUDE_DEBUG_INFO -void print_cil_box(FILE* fp, LSCRIPTType type) +void print_cil_box(LLFILE* fp, LSCRIPTType type) { switch(type) { @@ -68,7 +68,7 @@ void print_cil_box(FILE* fp, LSCRIPTType type) } } -void print_cil_type(FILE* fp, LSCRIPTType type) +void print_cil_type(LLFILE* fp, LSCRIPTType type) { switch(type) { @@ -99,7 +99,7 @@ void print_cil_type(FILE* fp, LSCRIPTType type) } } -void LLScriptType::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptType::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -127,7 +127,7 @@ S32 LLScriptType::getSize() return LSCRIPTDataSize[mType]; } -void LLScriptConstant::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptConstant::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -152,7 +152,7 @@ S32 LLScriptConstant::getSize() -void LLScriptConstantInteger::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptConstantInteger::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -200,7 +200,7 @@ S32 LLScriptConstantInteger::getSize() return LSCRIPTDataSize[LST_INTEGER]; } -void LLScriptConstantFloat::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptConstantFloat::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -247,7 +247,7 @@ S32 LLScriptConstantFloat::getSize() return LSCRIPTDataSize[LST_FLOATINGPOINT]; } -void print_escape_quotes(FILE* fp, const char* str) +void print_escape_quotes(LLFILE* fp, const char* str) { putc('"', fp); for(const char* c = str; *c != '\0'; ++c) @@ -261,7 +261,7 @@ void print_escape_quotes(FILE* fp, const char* str) putc('"', fp); } -void LLScriptConstantString::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptConstantString::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -317,7 +317,7 @@ S32 LLScriptConstantString::getSize() } -void LLScriptIdentifier::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptIdentifier::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -412,7 +412,7 @@ void LLScriptSimpleAssignable::addAssignable(LLScriptSimpleAssignable *assign) mNextp = assign; } -void LLScriptSimpleAssignable::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptSimpleAssignable::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -428,7 +428,7 @@ S32 LLScriptSimpleAssignable::getSize() return 0; } -void LLScriptSAIdentifier::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptSAIdentifier::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -512,7 +512,7 @@ S32 LLScriptSAIdentifier::getSize() return mIdentifier->getSize(); } -void LLScriptSAConstant::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptSAConstant::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -553,7 +553,7 @@ S32 LLScriptSAConstant::getSize() return mConstant->getSize(); } -void print_cil_cast(FILE* fp, LSCRIPTType srcType, LSCRIPTType targetType) +void print_cil_cast(LLFILE* fp, LSCRIPTType srcType, LSCRIPTType targetType) { switch(srcType) { @@ -680,7 +680,7 @@ bool is_SA_constant_integer(LLScriptSimpleAssignable* sa) return (sa->mType == LSSAT_CONSTANT && ((LLScriptSAConstant*) sa)->mConstant->mType == LST_INTEGER); } -void LLScriptSAVector::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptSAVector::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -827,7 +827,7 @@ S32 LLScriptSAVector::getSize() return mEntry1->getSize() + mEntry2->getSize() + mEntry3->getSize(); } -void LLScriptSAQuaternion::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptSAQuaternion::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -999,7 +999,7 @@ S32 LLScriptSAQuaternion::getSize() return mEntry1->getSize() + mEntry2->getSize() + mEntry3->getSize() + mEntry4->getSize(); } -void LLScriptSAList::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptSAList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1074,7 +1074,7 @@ void LLScriptGlobalVariable::addGlobal(LLScriptGlobalVariable *global) mNextp = global; } -void LLScriptGlobalVariable::gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptGlobalVariable::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { switch(pass) { @@ -1093,7 +1093,7 @@ void LLScriptGlobalVariable::gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTComp } } -void LLScriptGlobalVariable::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptGlobalVariable::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1288,7 +1288,7 @@ S32 LLScriptGlobalVariable::getSize() return return_size; } -void LLScriptEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { fprintf(fp, "Event Base Class -- should never get here!\n"); } @@ -1299,7 +1299,7 @@ S32 LLScriptEvent::getSize() return 0; } -void LLScriptStateEntryEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptStateEntryEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1335,7 +1335,7 @@ S32 LLScriptStateEntryEvent::getSize() return 0; } -void LLScriptStateExitEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptStateExitEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1371,7 +1371,7 @@ S32 LLScriptStateExitEvent::getSize() return 0; } -void LLScriptTouchStartEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptTouchStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1429,7 +1429,7 @@ S32 LLScriptTouchStartEvent::getSize() return 4; } -void LLScriptTouchEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptTouchEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1487,7 +1487,7 @@ S32 LLScriptTouchEvent::getSize() return 4; } -void LLScriptTouchEndEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptTouchEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1545,7 +1545,7 @@ S32 LLScriptTouchEndEvent::getSize() return 4; } -void LLScriptCollisionStartEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptCollisionStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1603,7 +1603,7 @@ S32 LLScriptCollisionStartEvent::getSize() return 4; } -void LLScriptCollisionEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptCollisionEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1661,7 +1661,7 @@ S32 LLScriptCollisionEvent::getSize() return 4; } -void LLScriptCollisionEndEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptCollisionEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1719,7 +1719,7 @@ S32 LLScriptCollisionEndEvent::getSize() return 4; } -void LLScriptLandCollisionStartEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptLandCollisionStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1778,7 +1778,7 @@ S32 LLScriptLandCollisionStartEvent::getSize() -void LLScriptLandCollisionEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptLandCollisionEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1836,7 +1836,7 @@ S32 LLScriptLandCollisionEvent::getSize() } -void LLScriptLandCollisionEndEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptLandCollisionEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1894,7 +1894,7 @@ S32 LLScriptLandCollisionEndEvent::getSize() } -void LLScriptInventoryEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptInventoryEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -1951,7 +1951,7 @@ S32 LLScriptInventoryEvent::getSize() return 4; } -void LLScriptAttachEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptAttachEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2008,7 +2008,7 @@ S32 LLScriptAttachEvent::getSize() return 4; } -void LLScriptDataserverEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptDataserverEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2080,7 +2080,7 @@ S32 LLScriptDataserverEvent::getSize() return 8; } -void LLScriptTimerEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptTimerEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2113,7 +2113,7 @@ S32 LLScriptTimerEvent::getSize() return 0; } -void LLScriptMovingStartEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptMovingStartEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2144,7 +2144,7 @@ S32 LLScriptMovingStartEvent::getSize() return 0; } -void LLScriptMovingEndEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptMovingEndEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2175,7 +2175,7 @@ S32 LLScriptMovingEndEvent::getSize() return 0; } -void LLScriptRTPEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptRTPEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2232,7 +2232,7 @@ S32 LLScriptRTPEvent::getSize() return 4; } -void LLScriptChatEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptChatEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2334,7 +2334,7 @@ S32 LLScriptChatEvent::getSize() return 16; } -void LLScriptSensorEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptSensorEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2391,7 +2391,7 @@ S32 LLScriptSensorEvent::getSize() return 4; } -void LLScriptObjectRezEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptObjectRezEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2448,7 +2448,7 @@ S32 LLScriptObjectRezEvent::getSize() return 4; } -void LLScriptControlEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptControlEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2535,7 +2535,7 @@ S32 LLScriptControlEvent::getSize() return 12; } -void LLScriptLinkMessageEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptLinkMessageEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2637,7 +2637,7 @@ S32 LLScriptLinkMessageEvent::getSize() return 16; } -void LLScriptRemoteEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptRemoteEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2769,7 +2769,7 @@ S32 LLScriptRemoteEvent::getSize() return 24; } -void LLScriptHTTPResponseEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptHTTPResponseEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2882,7 +2882,7 @@ S32 LLScriptHTTPResponseEvent::getSize() } -void LLScriptMoneyEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptMoneyEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -2954,7 +2954,7 @@ S32 LLScriptMoneyEvent::getSize() return 8; } -void LLScriptEmailEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptEmailEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3071,7 +3071,7 @@ S32 LLScriptEmailEvent::getSize() return 20; } -void LLScriptRezEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptRezEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3128,7 +3128,7 @@ S32 LLScriptRezEvent::getSize() return 4; } -void LLScriptNoSensorEvent::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptNoSensorEvent::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3161,7 +3161,7 @@ S32 LLScriptNoSensorEvent::getSize() return 0; } -void LLScriptAtTarget::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptAtTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3250,7 +3250,7 @@ S32 LLScriptAtTarget::getSize() -void LLScriptNotAtTarget::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptNotAtTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3283,7 +3283,7 @@ S32 LLScriptNotAtTarget::getSize() return 0; } -void LLScriptAtRotTarget::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptAtRotTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3372,7 +3372,7 @@ S32 LLScriptAtRotTarget::getSize() -void LLScriptNotAtRotTarget::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptNotAtRotTarget::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3416,7 +3416,7 @@ void LLScriptExpression::addExpression(LLScriptExpression *expression) mNextp = expression; } -void LLScriptExpression::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptExpression::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { fprintf(fp, "Expression Base Class -- should never get here!\n"); } @@ -3427,7 +3427,7 @@ S32 LLScriptExpression::getSize() return 0; } -void LLScriptExpression::gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptExpression::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3451,7 +3451,7 @@ void LLScriptExpression::gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompileP } } -void LLScriptForExpressionList::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptForExpressionList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3563,7 +3563,7 @@ S32 LLScriptForExpressionList::getSize() return 0; } -void LLScriptFuncExpressionList::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptFuncExpressionList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3700,7 +3700,7 @@ S32 LLScriptFuncExpressionList::getSize() return 0; } -void LLScriptListExpressionList::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptListExpressionList::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -3800,7 +3800,7 @@ bool is_parameter(LLScriptIdentifier* identifier, LLScriptScopeEntry* function_s } // If assignment is to global variable, pushes this pointer on to stack. -void print_cil_load_address(FILE* fp, LLScriptExpression* exp, LLScriptScopeEntry* function_scope) +void print_cil_load_address(LLFILE* fp, LLScriptExpression* exp, LLScriptScopeEntry* function_scope) { LLScriptLValue *lvalue = (LLScriptLValue *) exp; LLScriptIdentifier *ident = lvalue->mIdentifier; @@ -3836,7 +3836,7 @@ void print_cil_load_address(FILE* fp, LLScriptExpression* exp, LLScriptScopeEntr } } -void print_cil_accessor(FILE* fp, LLScriptLValue *lvalue) +void print_cil_accessor(LLFILE* fp, LLScriptLValue *lvalue) { LLScriptIdentifier *ident = lvalue->mIdentifier; print_cil_type(fp, lvalue->mReturnType); @@ -3845,13 +3845,13 @@ void print_cil_accessor(FILE* fp, LLScriptLValue *lvalue) fprintf(fp, "::%s\n", lvalue->mAccessor->mName); } -void print_cil_member(FILE* fp, LLScriptIdentifier *ident) +void print_cil_member(LLFILE* fp, LLScriptIdentifier *ident) { print_cil_type(fp, ident->mScopeEntry->mType); fprintf(fp, " LSL::%s\n", ident->mScopeEntry->mIdentifier); } -void LLScriptLValue::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptLValue::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -4136,7 +4136,7 @@ S32 LLScriptLValue::getSize() return 0; } -void print_asignment(FILE *fp, LLScriptExpression *exp) +void print_asignment(LLFILE *fp, LLScriptExpression *exp) { LLScriptLValue *lvalue = (LLScriptLValue *)exp; LLScriptIdentifier *ident = lvalue->mIdentifier; @@ -4164,7 +4164,7 @@ void print_asignment(FILE *fp, LLScriptExpression *exp) } } -void print_cil_asignment(FILE *fp, LLScriptExpression *exp, LLScriptScopeEntry* function_scope) +void print_cil_asignment(LLFILE *fp, LLScriptExpression *exp, LLScriptScopeEntry* function_scope) { LLScriptLValue *lvalue = (LLScriptLValue *) exp; LLScriptIdentifier *ident = lvalue->mIdentifier; @@ -4215,7 +4215,7 @@ void print_cil_asignment(FILE *fp, LLScriptExpression *exp, LLScriptScopeEntry* } } -void print_cast(FILE *fp, LSCRIPTType ret_type, LSCRIPTType right_type) +void print_cast(LLFILE *fp, LSCRIPTType ret_type, LSCRIPTType right_type) { if (right_type != ret_type) { @@ -4319,7 +4319,7 @@ void store2stack(LLScriptExpression *exp, LLScriptExpression *lv, LLScriptByteCo chunk->addInteger(address); } -void print_cil_numeric_cast(FILE* fp, LSCRIPTType currentArg, LSCRIPTType otherArg) +void print_cil_numeric_cast(LLFILE* fp, LSCRIPTType currentArg, LSCRIPTType otherArg) { if((currentArg == LST_INTEGER) && (otherArg == LST_FLOATINGPOINT)) { @@ -4327,7 +4327,7 @@ void print_cil_numeric_cast(FILE* fp, LSCRIPTType currentArg, LSCRIPTType otherA } } -void LLScriptAssignment::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -4387,7 +4387,7 @@ S32 LLScriptAssignment::getSize() return 0; } -void print_cil_add(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) +void print_cil_add(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) { switch(left_type) { @@ -4429,7 +4429,7 @@ void print_cil_add(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) } } -void LLScriptAddAssignment::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptAddAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -4496,7 +4496,7 @@ S32 LLScriptAddAssignment::getSize() return 0; } -void print_cil_sub(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) +void print_cil_sub(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) { switch(left_type) { @@ -4528,7 +4528,7 @@ void print_cil_sub(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) } } -void LLScriptSubAssignment::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptSubAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -4595,7 +4595,7 @@ S32 LLScriptSubAssignment::getSize() return 0; } -void print_cil_mul(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) +void print_cil_mul(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) { switch(left_type) { @@ -4650,7 +4650,7 @@ void print_cil_mul(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) } } -void LLScriptMulAssignment::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptMulAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -4717,7 +4717,7 @@ S32 LLScriptMulAssignment::getSize() return 0; } -void print_cil_div(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) +void print_cil_div(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) { switch(left_type) { @@ -4765,7 +4765,7 @@ void print_cil_div(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) } } -void LLScriptDivAssignment::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptDivAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -4832,7 +4832,7 @@ S32 LLScriptDivAssignment::getSize() return 0; } -void print_cil_mod(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) +void print_cil_mod(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) { switch(left_type) { @@ -4855,7 +4855,7 @@ void print_cil_mod(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) } } -void LLScriptModAssignment::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptModAssignment::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -4920,7 +4920,7 @@ S32 LLScriptModAssignment::getSize() return 0; } -void print_cil_eq(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) +void print_cil_eq(LLFILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) { switch(left_type) { @@ -4961,7 +4961,7 @@ void print_cil_eq(FILE* fp, LSCRIPTType left_type, LSCRIPTType right_type) } } -void LLScriptEquality::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptEquality::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5021,7 +5021,7 @@ S32 LLScriptEquality::getSize() return 0; } -void LLScriptNotEquals::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptNotEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5081,7 +5081,7 @@ S32 LLScriptNotEquals::getSize() return 0; } -void LLScriptLessEquals::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptLessEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5141,7 +5141,7 @@ S32 LLScriptLessEquals::getSize() return 0; } -void LLScriptGreaterEquals::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptGreaterEquals::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5201,7 +5201,7 @@ S32 LLScriptGreaterEquals::getSize() return 0; } -void LLScriptLessThan::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptLessThan::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5259,7 +5259,7 @@ S32 LLScriptLessThan::getSize() return 0; } -void LLScriptGreaterThan::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptGreaterThan::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5317,7 +5317,7 @@ S32 LLScriptGreaterThan::getSize() return 0; } -void LLScriptPlus::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptPlus::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5377,7 +5377,7 @@ S32 LLScriptPlus::getSize() return 0; } -void LLScriptMinus::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptMinus::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5437,7 +5437,7 @@ S32 LLScriptMinus::getSize() return 0; } -void LLScriptTimes::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptTimes::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5497,7 +5497,7 @@ S32 LLScriptTimes::getSize() return 0; } -void LLScriptDivide::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptDivide::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5557,7 +5557,7 @@ S32 LLScriptDivide::getSize() return 0; } -void LLScriptMod::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptMod::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5615,7 +5615,7 @@ S32 LLScriptMod::getSize() return 0; } -void LLScriptBitAnd::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptBitAnd::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5671,7 +5671,7 @@ S32 LLScriptBitAnd::getSize() return 0; } -void LLScriptBitOr::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptBitOr::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5727,7 +5727,7 @@ S32 LLScriptBitOr::getSize() return 0; } -void LLScriptBitXor::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptBitXor::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5783,7 +5783,7 @@ S32 LLScriptBitXor::getSize() return 0; } -void LLScriptBooleanAnd::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptBooleanAnd::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5839,7 +5839,7 @@ S32 LLScriptBooleanAnd::getSize() return 0; } -void LLScriptBooleanOr::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptBooleanOr::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5895,7 +5895,7 @@ S32 LLScriptBooleanOr::getSize() return 0; } -void LLScriptShiftLeft::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptShiftLeft::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -5952,7 +5952,7 @@ S32 LLScriptShiftLeft::getSize() } -void LLScriptShiftRight::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptShiftRight::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6008,7 +6008,7 @@ S32 LLScriptShiftRight::getSize() return 0; } -void LLScriptParenthesis::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptParenthesis::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6041,7 +6041,7 @@ S32 LLScriptParenthesis::getSize() return 0; } -void LLScriptUnaryMinus::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptUnaryMinus::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6088,7 +6088,7 @@ S32 LLScriptUnaryMinus::getSize() return 0; } -void LLScriptBooleanNot::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptBooleanNot::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6138,7 +6138,7 @@ S32 LLScriptBooleanNot::getSize() return 0; } -void LLScriptBitNot::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptBitNot::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6187,7 +6187,7 @@ S32 LLScriptBitNot::getSize() return 0; } -void LLScriptPreIncrement::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptPreIncrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6295,7 +6295,7 @@ S32 LLScriptPreIncrement::getSize() return 0; } -void LLScriptPreDecrement::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptPreDecrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6403,7 +6403,7 @@ S32 LLScriptPreDecrement::getSize() return 0; } -void LLScriptTypeCast::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptTypeCast::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6455,7 +6455,7 @@ S32 LLScriptTypeCast::getSize() return 0; } -void LLScriptVectorInitializer::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptVectorInitializer::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6571,7 +6571,7 @@ S32 LLScriptVectorInitializer::getSize() return 0; } -void LLScriptQuaternionInitializer::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptQuaternionInitializer::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6713,7 +6713,7 @@ S32 LLScriptQuaternionInitializer::getSize() return 0; } -void LLScriptListInitializer::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptListInitializer::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6793,7 +6793,7 @@ S32 LLScriptListInitializer::getSize() return 0; } -void LLScriptPostIncrement::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptPostIncrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -6925,7 +6925,7 @@ S32 LLScriptPostIncrement::getSize() return 0; } -void LLScriptPostDecrement::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptPostDecrement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7058,7 +7058,7 @@ S32 LLScriptPostDecrement::getSize() } // Generate arg list. -void print_cil_arg_list(FILE *fp, LLScriptFuncExpressionList* exp_list) +void print_cil_arg_list(LLFILE *fp, LLScriptFuncExpressionList* exp_list) { // Print first argument. print_cil_type(fp, exp_list->mFirstp->mReturnType); @@ -7071,7 +7071,7 @@ void print_cil_arg_list(FILE *fp, LLScriptFuncExpressionList* exp_list) } } -void LLScriptFunctionCall::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptFunctionCall::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7260,7 +7260,7 @@ S32 LLScriptFunctionCall::getSize() return 0; } -void LLScriptPrint::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptPrint::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7299,7 +7299,7 @@ S32 LLScriptPrint::getSize() return 0; } -void LLScriptConstantExpression::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptConstantExpression::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7338,7 +7338,7 @@ void LLScriptStatement::addStatement(LLScriptStatement *event) mNextp = event; } -void LLScriptStatement::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptStatement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { fprintf(fp, "Statement Base Class -- should never get here!\n"); } @@ -7349,7 +7349,7 @@ S32 LLScriptStatement::getSize() return 0; } -void LLScriptStatement::gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptStatement::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7384,7 +7384,7 @@ S32 LLScriptStatementSequence::getSize() return 0; } -void LLScriptStatementSequence::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptStatementSequence::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7431,7 +7431,7 @@ S32 LLScriptNOOP::getSize() return 0; } -void LLScriptNOOP::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptNOOP::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7527,7 +7527,7 @@ void add_exit_pops(LLScriptByteCodeChunk *chunk, LLScriptScopeEntry *entry) } } -void print_exit_pops(FILE *fp, LLScriptScopeEntry *entry) +void print_exit_pops(LLFILE *fp, LLScriptScopeEntry *entry) { // remember that we need to pop in reverse order S32 number, i; @@ -7557,7 +7557,7 @@ S32 LLScriptStateChange::getSize() return 0; } -void LLScriptStateChange::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptStateChange::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7627,7 +7627,7 @@ S32 LLScriptJump::getSize() return 0; } -void LLScriptJump::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptJump::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7690,7 +7690,7 @@ S32 LLScriptLabel::getSize() return 0; } -void LLScriptLabel::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptLabel::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7747,7 +7747,7 @@ void add_return(LLScriptByteCodeChunk *chunk, LLScriptScopeEntry *entry) chunk->addByte(LSCRIPTOpCodes[LOPC_RETURN]); } -void print_return(FILE *fp, LLScriptScopeEntry *entry) +void print_return(LLFILE *fp, LLScriptScopeEntry *entry) { print_exit_pops(fp, entry); fprintf(fp, "RETURN\n"); @@ -7759,7 +7759,7 @@ S32 LLScriptReturn::getSize() return 0; } -void LLScriptReturn::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptReturn::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7881,7 +7881,7 @@ S32 LLScriptExpressionStatement::getSize() return 0; } -void LLScriptExpressionStatement::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptExpressionStatement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -7951,7 +7951,7 @@ S32 LLScriptIf::getSize() return 0; } -void LLScriptIf::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptIf::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -8022,7 +8022,7 @@ S32 LLScriptIfElse::getSize() return 0; } -void LLScriptIfElse::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptIfElse::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -8115,7 +8115,7 @@ S32 LLScriptFor::getSize() return 0; } -void LLScriptFor::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptFor::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -8230,7 +8230,7 @@ S32 LLScriptDoWhile::getSize() return 0; } -void LLScriptDoWhile::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptDoWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -8303,7 +8303,7 @@ S32 LLScriptWhile::getSize() return 0; } -void LLScriptWhile::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -8386,7 +8386,7 @@ S32 LLScriptDeclaration::getSize() return mType->getSize(); } -void LLScriptDeclaration::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptDeclaration::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -8645,7 +8645,7 @@ S32 LLScriptCompoundStatement::getSize() return 0; } -void LLScriptCompoundStatement::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptCompoundStatement::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -8721,7 +8721,7 @@ void LLScriptEventHandler::addEvent(LLScriptEventHandler *event) mNextp = event; } -void LLScriptEventHandler::gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptEventHandler::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -8751,7 +8751,7 @@ S32 LLScriptEventHandler::getSize() U64 gCurrentHandler = 0; -void print_cil_local_init(FILE* fp, LLScriptScopeEntry* scopeEntry) +void print_cil_local_init(LLFILE* fp, LLScriptScopeEntry* scopeEntry) { if(scopeEntry->mLocals.getNumber() > 0) { @@ -8768,7 +8768,7 @@ void print_cil_local_init(FILE* fp, LLScriptScopeEntry* scopeEntry) } } -void LLScriptEventHandler::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptEventHandler::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -9071,7 +9071,7 @@ void LLScriptFunctionDec::addFunctionParameter(LLScriptFunctionDec *dec) mNextp = dec; } -void LLScriptFunctionDec::gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptFunctionDec::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -9108,7 +9108,7 @@ S32 LLScriptFunctionDec::getSize() return 0; } -void LLScriptFunctionDec::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptFunctionDec::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -9194,7 +9194,7 @@ void LLScriptGlobalFunctions::addGlobalFunction(LLScriptGlobalFunctions *global) mNextp = global; } -void LLScriptGlobalFunctions::gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptGlobalFunctions::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -9222,7 +9222,7 @@ S32 LLScriptGlobalFunctions::getSize() return 0; } -void LLScriptGlobalFunctions::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -9507,7 +9507,7 @@ void LLScriptState::addState(LLScriptState *state) mNextp = state; } -void LLScriptState::gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptState::gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -9535,7 +9535,7 @@ S32 LLScriptState::getSize() return 0; } -void LLScriptState::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptState::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -9755,7 +9755,7 @@ void LLScriptScript::setBytecodeDest(const char* dst_filename) mBytecodeDest[MAX_STRING-1] = '\0'; } -void print_cil_globals(FILE* fp, LLScriptGlobalVariable* global) +void print_cil_globals(LLFILE* fp, LLScriptGlobalVariable* global) { fprintf(fp, ".field private "); print_cil_type(fp, global->mType->mType); @@ -9768,7 +9768,7 @@ void print_cil_globals(FILE* fp, LLScriptGlobalVariable* global) } } -void LLScriptScript::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) +void LLScriptScript::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { if (gErrorToText.getErrors()) { @@ -9939,7 +9939,7 @@ void LLScriptScript::recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass // now, put it all together and spit it out // we need - FILE* bcfp = LLFile::fopen(mBytecodeDest, "wb"); /*Flawfinder: ignore*/ + LLFILE* bcfp = LLFile::fopen(mBytecodeDest, "wb"); /*Flawfinder: ignore*/ code->build(fp, bcfp); fclose(bcfp); diff --git a/indra/lscript/lscript_compile/lscript_tree.h b/indra/lscript/lscript_compile/lscript_tree.h index fee648ed69..f80d7fdf24 100644 --- a/indra/lscript/lscript_compile/lscript_tree.h +++ b/indra/lscript/lscript_compile/lscript_tree.h @@ -53,7 +53,7 @@ public: ~LLScriptType() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LSCRIPTType mType; @@ -70,7 +70,7 @@ public: virtual ~LLScriptConstant() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LSCRIPTType mType; @@ -86,7 +86,7 @@ public: ~LLScriptConstantInteger() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); S32 mValue; @@ -102,7 +102,7 @@ public: ~LLScriptConstantFloat() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); F32 mValue; @@ -122,7 +122,7 @@ public: mValue = NULL; } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); char *mValue; @@ -143,7 +143,7 @@ public: mName = NULL; } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); char *mName; @@ -177,7 +177,7 @@ public: // don't delete next pointer because we're going to store allocation lists and delete from those } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LSCRIPTSimpleAssignableType mType; @@ -196,7 +196,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mIdentifier; @@ -214,7 +214,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptConstant *mConstant; @@ -235,7 +235,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptSimpleAssignable *mEntry1; @@ -259,7 +259,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptSimpleAssignable *mEntry1; @@ -280,7 +280,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptSimpleAssignable *mEntryList; @@ -303,9 +303,9 @@ public: { } - void gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptType *mType; @@ -330,7 +330,7 @@ public: // don't delete next pointer because we're going to store allocation lists and delete from those } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LSCRIPTStateEventType mType; @@ -344,7 +344,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); ~LLScriptStateEntryEvent() {} @@ -360,7 +360,7 @@ public: ~LLScriptStateExitEvent() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); }; @@ -376,7 +376,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mCount; @@ -394,7 +394,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mCount; @@ -412,7 +412,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mCount; @@ -430,7 +430,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mCount; @@ -448,7 +448,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mCount; @@ -466,7 +466,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mCount; @@ -484,7 +484,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mPosition; @@ -502,7 +502,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mPosition; @@ -520,7 +520,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mPosition; @@ -536,7 +536,7 @@ public: ~LLScriptInventoryEvent() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mChange; @@ -552,7 +552,7 @@ public: ~LLScriptAttachEvent() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mAttach; @@ -568,7 +568,7 @@ public: ~LLScriptDataserverEvent() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mID; @@ -585,7 +585,7 @@ public: ~LLScriptTimerEvent() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); }; @@ -599,7 +599,7 @@ public: ~LLScriptMovingStartEvent() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); }; @@ -613,7 +613,7 @@ public: ~LLScriptMovingEndEvent() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); }; @@ -627,7 +627,7 @@ public: ~LLScriptRTPEvent() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mRTPermissions; @@ -645,7 +645,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mChannel; @@ -666,7 +666,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mID; @@ -684,7 +684,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mNumber; @@ -702,7 +702,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mName; @@ -722,7 +722,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mSender; @@ -743,7 +743,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mType; @@ -767,7 +767,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, @@ -791,7 +791,7 @@ public: } ~LLScriptRezEvent() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mStartParam; @@ -805,7 +805,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); ~LLScriptNoSensorEvent() {} @@ -819,7 +819,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); ~LLScriptAtTarget() {} @@ -837,7 +837,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); ~LLScriptNotAtTarget() {} @@ -851,7 +851,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); ~LLScriptAtRotTarget() {} @@ -869,7 +869,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); ~LLScriptNotAtRotTarget() {} @@ -887,7 +887,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mName; @@ -906,7 +906,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mTime; @@ -932,9 +932,9 @@ public: // don't delete next pointer because we're going to store allocation lists and delete from those } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); - void gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LSCRIPTExpressionType mType; @@ -955,7 +955,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mFirstp; @@ -974,7 +974,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mFirstp; @@ -993,7 +993,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mFirstp; @@ -1012,7 +1012,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); S32 mOffset; @@ -1032,7 +1032,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLValue; @@ -1051,7 +1051,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLValue; @@ -1070,7 +1070,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLValue; @@ -1089,7 +1089,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLValue; @@ -1108,7 +1108,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLValue; @@ -1127,7 +1127,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLValue; @@ -1146,7 +1146,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1165,7 +1165,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1184,7 +1184,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1203,7 +1203,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1222,7 +1222,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1241,7 +1241,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1260,7 +1260,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1279,7 +1279,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1298,7 +1298,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1317,7 +1317,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1336,7 +1336,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1355,7 +1355,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1374,7 +1374,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1393,7 +1393,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1412,7 +1412,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1431,7 +1431,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1450,7 +1450,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1469,7 +1469,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mLeftSide; @@ -1488,7 +1488,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1506,7 +1506,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1524,7 +1524,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1542,7 +1542,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1560,7 +1560,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1578,7 +1578,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1596,7 +1596,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptType *mType; @@ -1620,7 +1620,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression1; @@ -1647,7 +1647,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression1; @@ -1668,7 +1668,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpressionList; @@ -1686,7 +1686,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1704,7 +1704,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1722,7 +1722,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mIdentifier; @@ -1741,7 +1741,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1759,7 +1759,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptConstant *mConstant; @@ -1801,9 +1801,9 @@ public: void addStatement(LLScriptStatement *event); - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); - void gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LSCRIPTStatementType mType; @@ -1824,7 +1824,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptStatement *mFirstp; @@ -1841,7 +1841,7 @@ public: ~LLScriptNOOP() {} - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); }; @@ -1857,7 +1857,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mIdentifier; @@ -1875,7 +1875,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mIdentifier; @@ -1893,7 +1893,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptIdentifier *mIdentifier; @@ -1911,7 +1911,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1930,7 +1930,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1948,7 +1948,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LSCRIPTType mType; @@ -1968,7 +1968,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -1989,7 +1989,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mSequence; @@ -2011,7 +2011,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptStatement *mStatement; @@ -2031,7 +2031,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptExpression *mExpression; @@ -2052,7 +2052,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptType *mType; @@ -2072,7 +2072,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptStatement *mStatement; @@ -2094,9 +2094,9 @@ public: void addEvent(LLScriptEventHandler *event); - void gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptEvent *mEventp; @@ -2126,9 +2126,9 @@ public: void addFunctionParameter(LLScriptFunctionDec *dec); - void gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptType *mType; @@ -2154,9 +2154,9 @@ public: delete mFunctionScope; } - void gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LLScriptType *mType; @@ -2192,9 +2192,9 @@ public: { } - void gonext(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void gonext(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); LSCRIPTStateType mType; @@ -2222,7 +2222,7 @@ public: { } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata) { } @@ -2257,7 +2257,7 @@ public: delete mGlobalScope; } - void recurse(FILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); + void recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass pass, LSCRIPTPruneType ptype, BOOL &prunearg, LLScriptScope *scope, LSCRIPTType &type, LSCRIPTType basetype, U64 &count, LLScriptByteCodeChunk *chunk, LLScriptByteCodeChunk *heap, S32 stacksize, LLScriptScopeEntry *entry, S32 entrycount, LLScriptLibData **ldata); S32 getSize(); void setBytecodeDest(const char* dst_filename); diff --git a/indra/lscript/lscript_execute.h b/indra/lscript/lscript_execute.h index 1e11d32d09..5048f5a8d9 100644 --- a/indra/lscript/lscript_execute.h +++ b/indra/lscript/lscript_execute.h @@ -367,7 +367,7 @@ public: class LLScriptExecute { public: - LLScriptExecute(FILE *fp); + LLScriptExecute(LLFILE *fp); LLScriptExecute(U8 *buffer); ~LLScriptExecute(); diff --git a/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp index 6c8b1b40eb..b30e781d83 100644 --- a/indra/lscript/lscript_execute/lscript_execute.cpp +++ b/indra/lscript/lscript_execute/lscript_execute.cpp @@ -61,7 +61,7 @@ char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] = /*Flawfinder: ignore*/ //static S64 LLScriptExecute::sGlobalInstructionCount = 0; -LLScriptExecute::LLScriptExecute(FILE *fp) +LLScriptExecute::LLScriptExecute(LLFILE *fp) { U8 sizearray[4]; S32 filesize; @@ -3725,7 +3725,7 @@ void lscript_run(char *filename, BOOL b_debug) BOOL b_state; LLScriptExecute *execute = NULL; - FILE* file = LLFile::fopen(filename, "r"); + LLFILE* file = LLFile::fopen(filename, "r"); if (file) { execute = new LLScriptExecute(file); @@ -3734,7 +3734,7 @@ void lscript_run(char *filename, BOOL b_debug) file = LLFile::fopen(filename, "r"); if (file) { - FILE* fp = LLFile::fopen("lscript.parse", "w"); /*Flawfinder: ignore*/ + LLFILE* fp = LLFile::fopen("lscript.parse", "w"); /*Flawfinder: ignore*/ LLScriptLSOParse *parse = new LLScriptLSOParse(file); parse->printData(fp); delete parse; diff --git a/indra/lscript/lscript_execute/lscript_readlso.cpp b/indra/lscript/lscript_execute/lscript_readlso.cpp index e949374258..7f82926a3a 100644 --- a/indra/lscript/lscript_execute/lscript_readlso.cpp +++ b/indra/lscript/lscript_execute/lscript_readlso.cpp @@ -35,7 +35,7 @@ #include "lscript_library.h" #include "lscript_alloc.h" -LLScriptLSOParse::LLScriptLSOParse(FILE *fp) +LLScriptLSOParse::LLScriptLSOParse(LLFILE *fp) { U8 sizearray[4]; S32 filesize; @@ -68,7 +68,7 @@ LLScriptLSOParse::~LLScriptLSOParse() delete [] mRawData; } -void LLScriptLSOParse::printData(FILE *fp) +void LLScriptLSOParse::printData(LLFILE *fp) { @@ -86,14 +86,14 @@ void LLScriptLSOParse::printData(FILE *fp) printHeap(fp); } -void LLScriptLSOParse::printNameDesc(FILE *fp) +void LLScriptLSOParse::printNameDesc(LLFILE *fp) { fprintf(fp, "=============================\n\n"); } S32 gMajorVersion = 0; -void LLScriptLSOParse::printRegisters(FILE *fp) +void LLScriptLSOParse::printRegisters(LLFILE *fp) { // print out registers first S32 i; @@ -125,7 +125,7 @@ void LLScriptLSOParse::printRegisters(FILE *fp) fprintf(fp, "=============================\n\n"); } -void LLScriptLSOParse::printGlobals(FILE *fp) +void LLScriptLSOParse::printGlobals(LLFILE *fp) { // print out registers first S32 offset, varoffset; @@ -195,7 +195,7 @@ void LLScriptLSOParse::printGlobals(FILE *fp) fprintf(fp, "=============================\n\n"); } -void LLScriptLSOParse::printGlobalFunctions(FILE *fp) +void LLScriptLSOParse::printGlobalFunctions(LLFILE *fp) { // print out registers first S32 i, offset; @@ -284,7 +284,7 @@ void LLScriptLSOParse::printGlobalFunctions(FILE *fp) fprintf(fp, "=============================\n\n"); } -void LLScriptLSOParse::printStates(FILE *fp) +void LLScriptLSOParse::printStates(LLFILE *fp) { // print out registers first S32 i, offset; @@ -637,7 +637,7 @@ void LLScriptLSOParse::printStates(FILE *fp) fprintf(fp, "=============================\n\n"); } -void LLScriptLSOParse::printHeap(FILE *fp) +void LLScriptLSOParse::printHeap(LLFILE *fp) { // print out registers first @@ -652,7 +652,7 @@ void LLScriptLSOParse::printHeap(FILE *fp) fprintf(fp, "=============================\n\n"); } -void lso_print_tabs(FILE *fp, S32 tabs) +void lso_print_tabs(LLFILE *fp, S32 tabs) { S32 i; for (i = 0; i < tabs; i++) @@ -661,13 +661,13 @@ void lso_print_tabs(FILE *fp, S32 tabs) } } -void LLScriptLSOParse::printOpCodes(FILE *fp, S32 &offset, S32 tabs) +void LLScriptLSOParse::printOpCodes(LLFILE *fp, S32 &offset, S32 tabs) { U8 opcode = *(mRawData + offset); mPrintOpCodes[opcode](fp, mRawData, offset, tabs); } -void LLScriptLSOParse::printOpCodeRange(FILE *fp, S32 start, S32 end, S32 tabs) +void LLScriptLSOParse::printOpCodeRange(LLFILE *fp, S32 start, S32 end, S32 tabs) { while (start < end) { @@ -791,43 +791,43 @@ void LLScriptLSOParse::initOpCodePrinting() mPrintOpCodes[LSCRIPTOpCodes[LOPC_CALLLIB_TWO_BYTE]] = print_calllib_two_byte; } -void print_noop(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_noop(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tNOOP\n", offset++); } -void print_pop(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pop(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPOP\n", offset++); } -void print_pops(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pops(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPOPS\n", offset++); } -void print_popl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_popl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPOPL\n", offset++); } -void print_popv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_popv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPOPV\n", offset++); } -void print_popq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_popq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPOPQ\n", offset++); } -void print_poparg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_poparg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -836,61 +836,61 @@ void print_poparg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_popip(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_popip(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPOPIP\n", offset++); } -void print_popbp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_popbp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPOPBP\n", offset++); } -void print_popsp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_popsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPOPSP\n", offset++); } -void print_popslr(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_popslr(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPOPSLR\n", offset++); } -void print_dup(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_dup(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tDUP\n", offset++); } -void print_dups(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_dups(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tDUPS\n", offset++); } -void print_dupl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_dupl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tDUPL\n", offset++); } -void print_dupv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_dupv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tDUPV\n", offset++); } -void print_dupq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_dupq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tDUPQ\n", offset++); } -void print_store(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_store(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -899,7 +899,7 @@ void print_store(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_stores(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_stores(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -908,7 +908,7 @@ void print_stores(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_storel(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_storel(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -917,7 +917,7 @@ void print_storel(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_storev(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_storev(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -926,7 +926,7 @@ void print_storev(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_storeq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_storeq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -935,7 +935,7 @@ void print_storeq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_storeg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_storeg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -944,7 +944,7 @@ void print_storeg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR)); } -void print_storegs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_storegs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -953,7 +953,7 @@ void print_storegs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR)); } -void print_storegl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_storegl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -962,7 +962,7 @@ void print_storegl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR)); } -void print_storegv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_storegv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -971,7 +971,7 @@ void print_storegv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR)); } -void print_storegq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_storegq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -980,7 +980,7 @@ void print_storegq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR)); } -void print_loadp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_loadp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -989,7 +989,7 @@ void print_loadp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_loadsp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_loadsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -998,7 +998,7 @@ void print_loadsp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_loadlp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_loadlp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1007,7 +1007,7 @@ void print_loadlp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_loadvp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_loadvp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1016,7 +1016,7 @@ void print_loadvp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_loadqp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_loadqp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1025,7 +1025,7 @@ void print_loadqp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_loadgp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_loadgp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1034,7 +1034,7 @@ void print_loadgp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR)); } -void print_loadgsp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_loadgsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1043,7 +1043,7 @@ void print_loadgsp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR)); } -void print_loadglp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_loadglp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1052,7 +1052,7 @@ void print_loadglp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR)); } -void print_loadgvp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_loadgvp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1061,7 +1061,7 @@ void print_loadgvp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR)); } -void print_loadgqp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_loadgqp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1070,7 +1070,7 @@ void print_loadgqp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg + get_register(buffer, LREG_GVR)); } -void print_push(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_push(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1079,7 +1079,7 @@ void print_push(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_pushs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1088,7 +1088,7 @@ void print_pushs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_pushl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1097,7 +1097,7 @@ void print_pushl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_pushv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1106,7 +1106,7 @@ void print_pushv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_pushq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1115,7 +1115,7 @@ void print_pushq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_pushg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1124,7 +1124,7 @@ void print_pushg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "0x%X\n", arg + get_register(buffer, LREG_GVR)); } -void print_pushgs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushgs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1133,7 +1133,7 @@ void print_pushgs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "0x%X\n", arg + get_register(buffer, LREG_GVR)); } -void print_pushgl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushgl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1142,7 +1142,7 @@ void print_pushgl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "0x%X\n", arg + get_register(buffer, LREG_GVR)); } -void print_pushgv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushgv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1151,7 +1151,7 @@ void print_pushgv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "0x%X\n", arg + get_register(buffer, LREG_GVR)); } -void print_pushgq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushgq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1160,25 +1160,25 @@ void print_pushgq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "0x%X\n", arg + get_register(buffer, LREG_GVR)); } -void print_puship(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_puship(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPUSHIP\n", offset++); } -void print_pushbp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushbp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPUSHBP\n", offset++); } -void print_pushsp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPUSHSP\n", offset++); } -void print_pushargb(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushargb(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 arg; lso_print_tabs(fp, tabs); @@ -1187,7 +1187,7 @@ void print_pushargb(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", (U32)arg); } -void print_pushargi(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushargi(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1196,7 +1196,7 @@ void print_pushargi(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_pushargf(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushargf(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { F32 arg; lso_print_tabs(fp, tabs); @@ -1205,7 +1205,7 @@ void print_pushargf(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%f\n", arg); } -void print_pushargs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushargs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { char arg[1024]; /*Flawfinder: ignore*/ lso_print_tabs(fp, tabs); @@ -1214,7 +1214,7 @@ void print_pushargs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s\n", arg); } -void print_pushargv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushargv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { LLVector3 arg; lso_print_tabs(fp, tabs); @@ -1223,7 +1223,7 @@ void print_pushargv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "< %f, %f, %f >\n", arg.mV[VX], arg.mV[VY], arg.mV[VZ]); } -void print_pushargq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushargq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { LLQuaternion arg; lso_print_tabs(fp, tabs); @@ -1232,25 +1232,25 @@ void print_pushargq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "< %f, %f, %f, %f >\n", arg.mQ[VX], arg.mQ[VY], arg.mQ[VZ], arg.mQ[VS]); } -void print_pushe(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushe(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPUSHE\n", offset++); } -void print_pushev(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pushev(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPUSHEV\n", offset++); } -void print_pusheq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pusheq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPUSHEQ\n", offset++); } -void print_pusharge(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_pusharge(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1260,7 +1260,7 @@ void print_pusharge(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) } -void print_add(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_add(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1273,7 +1273,7 @@ void print_add(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_sub(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_sub(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1286,7 +1286,7 @@ void print_sub(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_mul(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_mul(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1299,7 +1299,7 @@ void print_mul(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_div(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_div(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1312,7 +1312,7 @@ void print_div(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_mod(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_mod(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1325,7 +1325,7 @@ void print_mod(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_eq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_eq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1338,7 +1338,7 @@ void print_eq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_neq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_neq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1351,7 +1351,7 @@ void print_neq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_leq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_leq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1364,7 +1364,7 @@ void print_leq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_geq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_geq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1377,7 +1377,7 @@ void print_geq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_less(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_less(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1390,7 +1390,7 @@ void print_less(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_greater(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_greater(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1404,50 +1404,50 @@ void print_greater(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) } -void print_bitand(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_bitand(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tBITAND\n", offset++); } -void print_bitor(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_bitor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tBITOR\n", offset++); } -void print_bitxor(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_bitxor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tBITXOR\n", offset++); } -void print_booland(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_booland(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tBOOLAND\n", offset++); } -void print_boolor(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_boolor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tBOOLOR\n", offset++); } -void print_shl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_shl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tSHL\n", offset++); } -void print_shr(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_shr(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tSHR\n", offset++); } -void print_neg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_neg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 type; lso_print_tabs(fp, tabs); @@ -1456,19 +1456,19 @@ void print_neg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s\n", LSCRIPTTypeNames[type]); } -void print_bitnot(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_bitnot(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tBITNOT\n", offset++); } -void print_boolnot(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_boolnot(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tBOOLNOT\n", offset++); } -void print_jump(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_jump(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1477,7 +1477,7 @@ void print_jump(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_jumpif(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_jumpif(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; U8 type; @@ -1488,7 +1488,7 @@ void print_jumpif(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %d\n", LSCRIPTTypeNames[type], arg); } -void print_jumpnif(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_jumpnif(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; U8 type; @@ -1499,7 +1499,7 @@ void print_jumpnif(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %d\n", LSCRIPTTypeNames[type], arg); } -void print_state(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_state(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1508,7 +1508,7 @@ void print_state(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_call(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_call(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1517,13 +1517,13 @@ void print_call(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_return(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_return(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tRETURN\n", offset++); } -void print_cast(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_cast(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 types; U8 type1; @@ -1536,7 +1536,7 @@ void print_cast(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s, %s\n", LSCRIPTTypeNames[type1], LSCRIPTTypeNames[type2]); } -void print_stacktos(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_stacktos(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1545,7 +1545,7 @@ void print_stacktos(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_stacktol(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_stacktol(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { S32 arg; lso_print_tabs(fp, tabs); @@ -1554,7 +1554,7 @@ void print_stacktol(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%d\n", arg); } -void print_print(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_print(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { lso_print_tabs(fp, tabs); fprintf(fp, "[0x%X]\tPRINT ", offset++); @@ -1562,7 +1562,7 @@ void print_print(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) fprintf(fp, "%s\n", LSCRIPTTypeNames[type]); } -void print_calllib(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_calllib(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U8 arg; lso_print_tabs(fp, tabs); @@ -1572,7 +1572,7 @@ void print_calllib(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) } -void print_calllib_two_byte(FILE *fp, U8 *buffer, S32 &offset, S32 tabs) +void print_calllib_two_byte(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs) { U16 arg; lso_print_tabs(fp, tabs); diff --git a/indra/lscript/lscript_execute/lscript_readlso.h b/indra/lscript/lscript_execute/lscript_readlso.h index 92c9dfab45..7ed6622bdd 100644 --- a/indra/lscript/lscript_execute/lscript_readlso.h +++ b/indra/lscript/lscript_execute/lscript_readlso.h @@ -36,135 +36,135 @@ #include "linked_lists.h" // list of op code print functions -void print_noop(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pop(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pops(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_popl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_popv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_popq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_poparg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_popip(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_popbp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_popsp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_popslr(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_dup(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_dups(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_dupl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_dupv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_dupq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_store(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_stores(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_storel(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_storev(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_storeq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_storeg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_storegs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_storegl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_storegv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_storegq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_loadp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_loadsp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_loadlp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_loadvp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_loadqp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_loadgp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_loadgsp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_loadglp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_loadgvp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_loadgqp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_push(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushgl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushgs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushgv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushgq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_puship(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushbp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushsp(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushargb(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushargi(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushargf(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushargs(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushargv(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushargq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushe(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pushev(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pusheq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_pusharge(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_add(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_sub(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_mul(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_div(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_mod(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_eq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_neq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_leq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_geq(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_less(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_greater(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_bitand(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_bitor(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_bitxor(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_booland(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_boolor(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_shl(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_shr(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_neg(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_bitnot(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_boolnot(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_jump(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_jumpif(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_jumpnif(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_state(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_call(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_return(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_cast(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_stacktos(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_stacktol(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_print(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); - -void print_calllib(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); -void print_calllib_two_byte(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_noop(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pop(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pops(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_popl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_popv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_popq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_poparg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_popip(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_popbp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_popsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_popslr(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_dup(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_dups(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_dupl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_dupv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_dupq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_store(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_stores(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_storel(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_storev(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_storeq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_storeg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_storegs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_storegl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_storegv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_storegq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_loadp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_loadsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_loadlp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_loadvp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_loadqp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_loadgp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_loadgsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_loadglp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_loadgvp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_loadgqp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_push(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushgl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushgs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushgv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushgq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_puship(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushbp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushsp(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushargb(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushargi(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushargf(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushargs(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushargv(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushargq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushe(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pushev(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pusheq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_pusharge(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_add(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_sub(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_mul(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_div(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_mod(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_eq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_neq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_leq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_geq(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_less(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_greater(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_bitand(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_bitor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_bitxor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_booland(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_boolor(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_shl(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_shr(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_neg(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_bitnot(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_boolnot(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_jump(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_jumpif(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_jumpnif(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_state(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_call(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_return(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_cast(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_stacktos(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_stacktol(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_print(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); + +void print_calllib(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); +void print_calllib_two_byte(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); class LLScriptLSOParse { public: - LLScriptLSOParse(FILE *fp); + LLScriptLSOParse(LLFILE *fp); LLScriptLSOParse(U8 *buffer); ~LLScriptLSOParse(); void initOpCodePrinting(); - void printData(FILE *fp); - void printNameDesc(FILE *fp); - void printRegisters(FILE *fp); - void printGlobals(FILE *fp); - void printGlobalFunctions(FILE *fp); - void printStates(FILE *fp); - void printHeap(FILE *fp); - void printOpCodes(FILE *fp, S32 &offset, S32 tabs); - void printOpCodeRange(FILE *fp, S32 start, S32 end, S32 tabs); + void printData(LLFILE *fp); + void printNameDesc(LLFILE *fp); + void printRegisters(LLFILE *fp); + void printGlobals(LLFILE *fp); + void printGlobalFunctions(LLFILE *fp); + void printStates(LLFILE *fp); + void printHeap(LLFILE *fp); + void printOpCodes(LLFILE *fp, S32 &offset, S32 tabs); + void printOpCodeRange(LLFILE *fp, S32 start, S32 end, S32 tabs); U8 *mRawData; - void (*mPrintOpCodes[0x100])(FILE *fp, U8 *buffer, S32 &offset, S32 tabs); + void (*mPrintOpCodes[0x100])(LLFILE *fp, U8 *buffer, S32 &offset, S32 tabs); }; -void lso_print_tabs(FILE *fp, S32 tabs); +void lso_print_tabs(LLFILE *fp, S32 tabs); #endif diff --git a/indra/lscript/lscript_library/lscript_alloc.cpp b/indra/lscript/lscript_library/lscript_alloc.cpp index 519ef9fb8c..c297e5efab 100644 --- a/indra/lscript/lscript_library/lscript_alloc.cpp +++ b/indra/lscript/lscript_library/lscript_alloc.cpp @@ -851,7 +851,7 @@ void lsa_print_heap(U8 *buffer) printf("==========\n"); } -void lsa_fprint_heap(U8 *buffer, FILE *fp) +void lsa_fprint_heap(U8 *buffer, LLFILE *fp) { S32 offset = get_register(buffer, LREG_HR); S32 readoffset; diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp index 3d8abe5857..767327f95f 100644 --- a/indra/mac_crash_logger/llcrashloggermac.cpp +++ b/indra/mac_crash_logger/llcrashloggermac.cpp @@ -53,7 +53,7 @@ const S32 SETTINGS_FILE_VERSION = 101; // Windows Message Handlers BOOL gFirstDialog = TRUE; // Are we currently handling the Send/Don't Send dialog? -FILE *gDebugFile = NULL; +LLFILE *gDebugFile = NULL; WindowRef gWindow = NULL; EventHandlerRef gEventHandler = NULL; diff --git a/indra/mac_updater/mac_updater.cpp b/indra/mac_updater/mac_updater.cpp index 396a40288a..2437071068 100644 --- a/indra/mac_updater/mac_updater.cpp +++ b/indra/mac_updater/mac_updater.cpp @@ -727,7 +727,7 @@ void *updatethreadproc(void*) char temp[PATH_MAX] = ""; /* Flawfinder: ignore */ // *NOTE: This buffer length is used in a scanf() below. char deviceNode[1024] = ""; /* Flawfinder: ignore */ - FILE *downloadFile = NULL; + LLFILE *downloadFile = NULL; OSStatus err; ProcessSerialNumber psn; char target[PATH_MAX] = ""; /* Flawfinder: ignore */ @@ -942,7 +942,7 @@ void *updatethreadproc(void*) snprintf(temp, sizeof(temp), "SecondLife.dmg"); - downloadFile = fopen(temp, "wb"); /* Flawfinder: ignore */ + downloadFile = LLFile::fopen(temp, "wb"); /* Flawfinder: ignore */ if(downloadFile == NULL) { throw 0; diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f1e4b39d7d..588d22a45b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5334,6 +5334,28 @@ <key>Value</key> <integer>0</integer> </map> + <key>RenderDebugGL</key> + <map> + <key>Comment</key> + <string>Enable strict GL debugging.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> + <key>RenderDebugPipeline</key> + <map> + <key>Comment</key> + <string>Enable strict pipeline debugging.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>RenderDebugTextureBind</key> <map> <key>Comment</key> @@ -5826,17 +5848,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>RenderUseCleverUI</key> - <map> - <key>Comment</key> - <string>Turns on the \"clever\" UI rendering optimization. It's a known performace gain on apple.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>RenderUseFarClip</key> <map> <key>Comment</key> diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 45fbb5e65f..1ad37f239c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -222,6 +222,7 @@ extern OSStatus DisplayReleaseNotes(void); extern BOOL gRandomizeFramerate; extern BOOL gPeriodicSlowFrame; +extern BOOL gDebugGL; //////////////////////////////////////////////////////////// // All from the last globals push... @@ -421,7 +422,8 @@ static void settings_modify() LLVOAvatar::sUseImpostors = gSavedSettings.getBOOL("RenderUseImpostors"); LLVOSurfacePatch::sLODFactor = gSavedSettings.getF32("RenderTerrainLODFactor"); LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //sqaure lod factor to get exponential range of [1,4] - gGL.setClever(gSavedSettings.getBOOL("RenderUseCleverUI")); + gDebugGL = gSavedSettings.getBOOL("RenderDebugGL"); + gDebugPipeline = gSavedSettings.getBOOL("RenderDebugPipeline"); #if LL_VECTORIZE if (gSysCPU.hasAltivec()) @@ -2977,7 +2979,7 @@ void LLAppViewer::loadNameCache() // Try to load from the legacy format. This should go away after a // while. Phoenix 2008-01-30 - FILE* name_cache_fp = LLFile::fopen(name_cache.c_str(), "r"); // Flawfinder: ignore + LLFILE* name_cache_fp = LLFile::fopen(name_cache.c_str(), "r"); // Flawfinder: ignore if (name_cache_fp) { gCacheName->importFile(name_cache_fp); diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp index 3ea8c737c9..753ea1bc6c 100644 --- a/indra/newview/llappviewerlinux.cpp +++ b/indra/newview/llappviewerlinux.cpp @@ -131,7 +131,7 @@ static inline BOOL do_basic_glibc_backtrace() std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log"); llinfos << "Opening stack trace file " << strace_filename << llendl; - FILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w"); + LLFILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w"); if (!StraceFile) { llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl; @@ -162,7 +162,7 @@ static inline BOOL do_basic_glibc_backtrace() std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log"); llinfos << "Opening stack trace file " << strace_filename << llendl; - FILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w"); // Flawfinder: ignore + LLFILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w"); // Flawfinder: ignore if (!StraceFile) { llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl; @@ -200,7 +200,7 @@ static inline BOOL do_elfio_glibc_backtrace() std::string strace_filename = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"stack_trace.log"); llinfos << "Opening stack trace file " << strace_filename << llendl; - FILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w"); // Flawfinder: ignore + LLFILE* StraceFile = LLFile::fopen(strace_filename.c_str(), "w"); // Flawfinder: ignore if (!StraceFile) { llinfos << "Opening stack trace file " << strace_filename << " failed. Using stderr." << llendl; diff --git a/indra/newview/llbox.cpp b/indra/newview/llbox.cpp index d0505b6b06..1a3cf36ce6 100644 --- a/indra/newview/llbox.cpp +++ b/indra/newview/llbox.cpp @@ -81,7 +81,7 @@ void LLBox::renderface(S32 which_face) {7, 4, 0, 3} }; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); //gGL.normal3fv(&normals[which_face][0]); gGL.texCoord2f(1,0); gGL.vertex3fv(&mVertex[ faces[which_face][0] ][0]); diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp index 619b393d0b..8e5e8c8ea3 100644 --- a/indra/newview/llcompilequeue.cpp +++ b/indra/newview/llcompilequeue.cpp @@ -386,7 +386,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id, asset_id.toString(uuid_str); snprintf(filename, sizeof(filename), "%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type)); /* Flawfinder: ignore */ - FILE *fp = LLFile::fopen(filename, "wb"); /*Flawfinder: ignore*/ + LLFILE *fp = LLFile::fopen(filename, "wb"); /*Flawfinder: ignore*/ if (fp) { const S32 buf_size = 65536; diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 1c430b3a14..95e3bc2205 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -508,7 +508,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) LLVector3 pos = avatarp->getPositionAgent(); gGL.color4f(1.0f, 0.0f, 0.0f, 0.8f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV); gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV); @@ -520,7 +520,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) pos = avatarp->mDrawable->getPositionAgent(); gGL.color4f(1.0f, 0.0f, 0.0f, 0.8f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV); gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV); @@ -532,7 +532,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) pos = avatarp->mRoot.getWorldPosition(); gGL.color4f(1.0f, 1.0f, 1.0f, 0.8f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV); gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV); @@ -544,7 +544,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) pos = avatarp->mPelvisp->getWorldPosition(); gGL.color4f(0.0f, 0.0f, 1.0f, 0.8f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV); gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV); diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index e5c9200cad..3f52021711 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -100,7 +100,7 @@ void LLStandardBumpmap::restoreGL() gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount++] = LLStandardBumpmap("Darkness"); // BE_DARKNESS std::string file_name = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "std_bump.ini" ); - FILE* file = LLFile::fopen( file_name.c_str(), "rt" ); /*Flawfinder: ignore*/ + LLFILE* file = LLFile::fopen( file_name.c_str(), "rt" ); /*Flawfinder: ignore*/ if( !file ) { llwarns << "Could not open std_bump <" << file_name << ">" << llendl; diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp index cdb7531341..7b88349ef4 100644 --- a/indra/newview/lldynamictexture.cpp +++ b/indra/newview/lldynamictexture.cpp @@ -223,17 +223,18 @@ BOOL LLDynamicTexture::updateAllInstances() glClear(GL_DEPTH_BUFFER_BIT); gDisplaySwapBuffers = FALSE; + + gGL.color4f(1,1,1,1); dynamicTexture->preRender(); // Must be called outside of startRender() - LLVertexBuffer::startRender(); - if (dynamicTexture->render()) { result = TRUE; sNumRenders++; } - LLVertexBuffer::stopRender(); - + gGL.flush(); + LLVertexBuffer::unbind(); + dynamicTexture->postRender(result); } } diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 3ced3541d2..723477a833 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -493,7 +493,7 @@ void LLFace::renderSelectedUV(const S32 offset, const S32 count) glPolygonOffset(factor, bias); if (sSafeRenderSelect) { - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); if (count) { for (S32 i = offset; i < offset + count; i++) diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index fd9d790f27..8133c20bf7 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -978,7 +978,7 @@ void LLFastTimerView::draw() gGL.color4f(0.5f,0.5f,0.5f,1); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex2i((S32)bar, graph_rect.mBottom); gGL.vertex2i((S32)bar, graph_rect.mTop); gGL.end(); @@ -1014,7 +1014,7 @@ void LLFastTimerView::draw() } gGL.color4f(col[0], col[1], col[2], alpha); - gGL.begin(GL_LINE_STRIP); + gGL.begin(LLVertexBuffer::LINE_STRIP); for (U32 j = 0; j < LLFastTimer::FTM_HISTORY_NUM; j++) { U64 ticks = ticks_sum[j+1][idx]; diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h index 927f4ada45..ffa8420697 100644 --- a/indra/newview/llfeaturemanager.h +++ b/indra/newview/llfeaturemanager.h @@ -76,7 +76,7 @@ public: void setFeatureAvailable(const char *name, const BOOL available); void setRecommendedLevel(const char *name, const F32 level); - BOOL loadFeatureList(FILE *fp); + BOOL loadFeatureList(LLFILE *fp); BOOL maskList(LLFeatureList &mask); diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp index c2495e4037..d9411b58d8 100644 --- a/indra/newview/llfloateranimpreview.cpp +++ b/indra/newview/llfloateranimpreview.cpp @@ -382,7 +382,7 @@ void LLFloaterAnimPreview::draw() gGL.color3f(1.f, 1.f, 1.f); mAnimPreview->bindTexture(); - gGL.begin( GL_QUADS ); + gGL.begin( LLVertexBuffer::QUADS ); { gGL.texCoord2f(0.f, 1.f); gGL.vertex2i(PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT); @@ -1068,8 +1068,6 @@ BOOL LLPreviewAnimation::render() { mNeedsUpdate = FALSE; LLVOAvatar* avatarp = mDummyAvatar; - - gGL.start(); glMatrixMode(GL_PROJECTION); gGL.pushMatrix(); @@ -1092,7 +1090,7 @@ BOOL LLPreviewAnimation::render() glMatrixMode(GL_MODELVIEW); gGL.popMatrix(); - gGL.stop(); + gGL.flush(); LLVector3 target_pos = avatarp->mRoot.getWorldPosition(); @@ -1124,9 +1122,9 @@ BOOL LLPreviewAnimation::render() avatarp->updateMotion(); } - LLVertexBuffer::stopRender(); + LLVertexBuffer::unbind(); avatarp->updateLOD(); - LLVertexBuffer::startRender(); + avatarp->mRoot.updateWorldMatrixChildren(); @@ -1140,6 +1138,7 @@ BOOL LLPreviewAnimation::render() avatarPoolp->renderAvatars(avatarp); // renders only one avatar } + gGL.color4f(1,1,1,1); return TRUE; } diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp index 751de2be20..5f6bf1cd28 100644 --- a/indra/newview/llfloatercolorpicker.cpp +++ b/indra/newview/llfloatercolorpicker.cpp @@ -545,7 +545,7 @@ void LLFloaterColorPicker::draw() { LLGLSNoTexture no_texture; LLGLEnable(GL_CULL_FACE); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.color4f(0.f, 0.f, 0.f, CONTEXT_CONE_IN_ALPHA * mContextConeOpacity); gGL.vertex2i(swatch_rect.mLeft, swatch_rect.mTop); diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp index 67f9ebe6b4..790af61264 100644 --- a/indra/newview/llfloaterimagepreview.cpp +++ b/indra/newview/llfloaterimagepreview.cpp @@ -260,7 +260,7 @@ void LLFloaterImagePreview::draw() } gGL.color3f(1.f, 1.f, 1.f); - gGL.begin( GL_QUADS ); + gGL.begin( LLVertexBuffer::QUADS ); { gGL.texCoord2f(mPreviewImageRect.mLeft, mPreviewImageRect.mTop); gGL.vertex2i(PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT); @@ -288,7 +288,7 @@ void LLFloaterImagePreview::draw() else mAvatarPreview->bindTexture(); - gGL.begin( GL_QUADS ); + gGL.begin( LLVertexBuffer::QUADS ); { gGL.texCoord2f(0.f, 1.f); gGL.vertex2i(PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT); @@ -667,8 +667,6 @@ void LLImagePreviewAvatar::setPreviewTarget(const char* joint_name, const char* //----------------------------------------------------------------------------- BOOL LLImagePreviewAvatar::render() { - gGL.start(); - mNeedsUpdate = FALSE; LLVOAvatar* avatarp = mDummyAvatar; @@ -692,7 +690,7 @@ BOOL LLImagePreviewAvatar::render() glMatrixMode(GL_MODELVIEW); gGL.popMatrix(); - gGL.stop(); + gGL.flush(); LLVector3 target_pos = mTargetJoint->getWorldPosition(); LLQuaternion camera_rot = LLQuaternion(mCameraPitch, LLVector3::y_axis) * @@ -710,9 +708,9 @@ BOOL LLImagePreviewAvatar::render() LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / mCameraZoom); LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE); - LLVertexBuffer::stopRender(); + LLVertexBuffer::unbind(); avatarp->updateLOD(); - LLVertexBuffer::startRender(); + if (avatarp->mDrawable.notNull()) { @@ -725,6 +723,7 @@ BOOL LLImagePreviewAvatar::render() avatarPoolp->renderAvatars(avatarp); // renders only one avatar } + gGL.color4f(1,1,1,1); return TRUE; } @@ -823,8 +822,6 @@ void LLImagePreviewSculpted::setPreviewTarget(LLImageRaw* imagep, F32 distance) //----------------------------------------------------------------------------- BOOL LLImagePreviewSculpted::render() { - gGL.start(); - mNeedsUpdate = FALSE; LLGLSUIDefault def; @@ -919,8 +916,6 @@ BOOL LLImagePreviewSculpted::render() delete [] normals; } - gGL.stop(); - return TRUE; } diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index e5b9eef72a..7950b127f0 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -415,7 +415,7 @@ void LLSnapshotLivePreview::draw() glPushMatrix(); { glTranslatef((F32)rect.mLeft, (F32)rect.mBottom, 0.f); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.texCoord2f(uv_width, uv_height); gGL.vertex2i(rect.getWidth(), rect.getHeight() ); @@ -478,7 +478,7 @@ void LLSnapshotLivePreview::draw() S32 y2 = gViewerWindow->getWindowHeight(); LLGLSNoTexture no_texture; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.color4f(1.f, 1.f, 1.f, 0.f); gGL.vertex2i(x1, y1); @@ -509,7 +509,7 @@ void LLSnapshotLivePreview::draw() LLGLSNoTexture no_texture; gGL.color4f(1.f, 1.f, 1.f, 1.f); LLRect outline_rect = mImageRect[mCurImageIndex]; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.vertex2i(outline_rect.mLeft - BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH); gGL.vertex2i(outline_rect.mRight + BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH); @@ -555,7 +555,7 @@ void LLSnapshotLivePreview::draw() LLRect& rect = mImageRect[old_image_index]; glTranslatef((F32)rect.mLeft, (F32)rect.mBottom - llround(getRect().getHeight() * 2.f * (fall_interp * fall_interp)), 0.f); glRotatef(-45.f * fall_interp, 0.f, 0.f, 1.f); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.texCoord2f(uv_width, uv_height); gGL.vertex2i(rect.getWidth(), rect.getHeight() ); diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp index f6d9ee9761..21b98d6038 100644 --- a/indra/newview/llglsandbox.cpp +++ b/indra/newview/llglsandbox.cpp @@ -358,7 +358,7 @@ void LLCompass::draw() mBkgndTexture->bind(); gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.texCoord2f(1.f, 1.f); gGL.vertex2i(width, height); @@ -384,7 +384,7 @@ void LLCompass::draw() mTexture->bind(); gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.texCoord2f(1.f, 1.f); gGL.vertex2i(width, height); @@ -428,7 +428,7 @@ void LLHorizontalCompass::draw() mTexture->bind(); gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f ); - gGL.begin( GL_QUADS ); + gGL.begin( LLVertexBuffer::QUADS ); gGL.texCoord2f(right, 1.f); gGL.vertex2i(width, height); @@ -479,11 +479,11 @@ void LLWind::renderVectors() gGL.pushMatrix(); gGL.translatef((F32)i * region_width_meters/mSize, (F32)j * region_width_meters/mSize, 0.0); gGL.color3f(0,1,0); - gGL.begin(GL_POINTS); + gGL.begin(LLVertexBuffer::POINTS); gGL.vertex3f(0,0,0); gGL.end(); gGL.color3f(1,0,0); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex3f(x * 0.1f, y * 0.1f ,0.f); gGL.vertex3f(x, y, 0.f); gGL.end(); @@ -532,7 +532,7 @@ void LLViewerParcelMgr::renderRect(const LLVector3d &west_south_bottom_global, gGL.color4f(1.f, 1.f, 0.f, 1.f); // Cheat and give this the same pick-name as land - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex3f(west, north, nw_bottom); gGL.vertex3f(west, north, nw_top); @@ -549,7 +549,7 @@ void LLViewerParcelMgr::renderRect(const LLVector3d &west_south_bottom_global, gGL.end(); gGL.color4f(1.f, 1.f, 0.f, 0.2f); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.vertex3f(west, north, nw_bottom); gGL.vertex3f(west, north, nw_top); @@ -616,7 +616,7 @@ void LLViewerParcelMgr::renderParcel(LLParcel* parcel ) gGL.color4f(0.f, 1.f, 1.f, 1.f); // Cheat and give this the same pick-name as land - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex3f(west, north, nw_bottom); gGL.vertex3f(west, north, nw_top); @@ -633,7 +633,7 @@ void LLViewerParcelMgr::renderParcel(LLParcel* parcel ) gGL.end(); gGL.color4f(0.f, 1.f, 1.f, 0.2f); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.vertex3f(west, north, nw_bottom); gGL.vertex3f(west, north, nw_top); @@ -786,7 +786,7 @@ void LLViewerParcelMgr::renderHighlightSegments(const U8* segments, LLViewerRegi if (!has_segments) { has_segments = true; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); } renderOneSegment(x1, y1, x2, y2, PARCEL_POST_HEIGHT, SOUTH_MASK, regionp); } @@ -802,7 +802,7 @@ void LLViewerParcelMgr::renderHighlightSegments(const U8* segments, LLViewerRegi if (!has_segments) { has_segments = true; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); } renderOneSegment(x1, y1, x2, y2, PARCEL_POST_HEIGHT, WEST_MASK, regionp); } @@ -857,7 +857,7 @@ void LLViewerParcelMgr::renderCollisionSegments(U8* segments, BOOL use_pass, LLV LLViewerImage::bindTexture(mBlockedImage); } - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); for (y = 0; y < STRIDE; y++) { @@ -1014,7 +1014,7 @@ void LLViewerObjectList::renderObjectBeacons() LLGLSNoTexture gls_ui_no_texture; S32 last_line_width = -1; - // gGL.begin(GL_LINES); // Always happens in (line_width != last_line_width) + // gGL.begin(LLVertexBuffer::LINES); // Always happens in (line_width != last_line_width) for (S32 i = 0; i < mDebugBeacons.count(); i++) { @@ -1031,7 +1031,7 @@ void LLViewerObjectList::renderObjectBeacons() } glLineWidth( (F32)line_width ); last_line_width = line_width; - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); } const LLVector3 &thisline = debug_beacon.mPositionAgent; @@ -1053,7 +1053,7 @@ void LLViewerObjectList::renderObjectBeacons() LLGLDepthTest gls_depth(GL_TRUE); S32 last_line_width = -1; - // gGL.begin(GL_LINES); // Always happens in (line_width != last_line_width) + // gGL.begin(LLVertexBuffer::LINES); // Always happens in (line_width != last_line_width) for (S32 i = 0; i < mDebugBeacons.count(); i++) { @@ -1069,7 +1069,7 @@ void LLViewerObjectList::renderObjectBeacons() } glLineWidth( (F32)line_width ); last_line_width = line_width; - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); } const LLVector3 &thisline = debug_beacon.mPositionAgent; diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp index 046eac73fe..7dd20debd9 100644 --- a/indra/newview/llhudeffectlookat.cpp +++ b/indra/newview/llhudeffectlookat.cpp @@ -504,7 +504,7 @@ void LLHUDEffectLookAt::render() glPushMatrix(); glTranslatef(target.mV[VX], target.mV[VY], target.mV[VZ]); glScalef(0.3f, 0.3f, 0.3f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { LLColor3 color = (*mAttentions)[mTargetType].mColor; gGL.color3f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE]); diff --git a/indra/newview/llhudeffectpointat.cpp b/indra/newview/llhudeffectpointat.cpp index 4c352bab72..72fe1b2e08 100644 --- a/indra/newview/llhudeffectpointat.cpp +++ b/indra/newview/llhudeffectpointat.cpp @@ -334,7 +334,7 @@ void LLHUDEffectPointAt::render() glPushMatrix(); glTranslatef(target.mV[VX], target.mV[VY], target.mV[VZ]); glScalef(0.3f, 0.3f, 0.3f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.color3f(1.f, 0.f, 0.f); gGL.vertex3f(-1.f, 0.f, 0.f); diff --git a/indra/newview/llhudicon.cpp b/indra/newview/llhudicon.cpp index 248caf07a9..cbb9fb8619 100644 --- a/indra/newview/llhudicon.cpp +++ b/indra/newview/llhudicon.cpp @@ -166,7 +166,7 @@ void LLHUDIcon::renderIcon(BOOL for_select) LLViewerImage::bindTexture(mImagep); } - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.texCoord2f(0.f, 1.f); gGL.vertex3fv(upper_left.mV); diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp index d6bafa9b58..07b0379f7a 100644 --- a/indra/newview/llhudobject.cpp +++ b/indra/newview/llhudobject.cpp @@ -281,6 +281,9 @@ void LLHUDObject::renderAll() hud_objp->render(); } } + + // cleanup any leftover client state, etc + LLVertexBuffer::unbind(); } // static diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index 47e23f1c6a..2529010857 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -317,7 +317,7 @@ void LLHUDText::renderText(BOOL for_select) LLUI::translate(box_center_offset.mV[VX], box_center_offset.mV[VY], box_center_offset.mV[VZ]); gGL.color4fv(bg_color.mV); LLUI::setLineWidth(2.0); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { if (outside_width) { diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 32a9fc95b4..8cbc55892f 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1810,7 +1810,7 @@ bool LLInventoryModel::loadSkeleton( const S32 NO_VERSION = LLViewerInventoryCategory::VERSION_UNKNOWN; std::string gzip_filename(inventory_filename); gzip_filename.append(".gz"); - FILE* fp = LLFile::fopen(gzip_filename.c_str(), "rb"); /*Flawfinder: ignore*/ + LLFILE* fp = LLFile::fopen(gzip_filename.c_str(), "rb"); /*Flawfinder: ignore*/ bool remove_inventory_file = false; if(fp) { @@ -2344,7 +2344,7 @@ bool LLInventoryModel::loadFromFile( return false; } llinfos << "LLInventoryModel::loadFromFile(" << filename << ")" << llendl; - FILE* file = LLFile::fopen(filename, "rb"); /*Flawfinder: ignore*/ + LLFILE* file = LLFile::fopen(filename, "rb"); /*Flawfinder: ignore*/ if(!file) { llinfos << "unable to load inventory from: " << filename << llendl; @@ -2417,7 +2417,7 @@ bool LLInventoryModel::saveToFile( return false; } llinfos << "LLInventoryModel::saveToFile(" << filename << ")" << llendl; - FILE* file = LLFile::fopen(filename, "wb"); /*Flawfinder: ignore*/ + LLFILE* file = LLFile::fopen(filename, "wb"); /*Flawfinder: ignore*/ if(!file) { llwarns << "unable to save inventory to: " << filename << llendl; @@ -3692,7 +3692,7 @@ BOOL decompress_file(const char* src_filename, const char* dst_filename) BOOL rv = FALSE; gzFile src = NULL; U8* buffer = NULL; - FILE* dst = NULL; + LLFILE* dst = NULL; S32 bytes = 0; const S32 DECOMPRESS_BUFFER_SIZE = 32000; diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp index 21dc28784b..e9d5bfddd2 100644 --- a/indra/newview/lljoystickbutton.cpp +++ b/indra/newview/lljoystickbutton.cpp @@ -655,7 +655,7 @@ void LLJoystickCameraRotate::drawRotatedImage( const LLImageGL* image, S32 rotat gGL.color4fv(UI_VERTEX_COLOR.mV); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.texCoord2fv( uv[ (rotations + 0) % 4]); gGL.vertex2i(width, height ); diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 6aa209b787..91e6ef1e05 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -76,7 +76,7 @@ void LLLogChat::saveHistory(LLString filename, LLString line) return; } - FILE* fp = LLFile::fopen(LLLogChat::makeLogFileName(filename).c_str(), "a"); /*Flawfinder: ignore*/ + LLFILE* fp = LLFile::fopen(LLLogChat::makeLogFileName(filename).c_str(), "a"); /*Flawfinder: ignore*/ if (!fp) { llinfos << "Couldn't open chat history log!" << llendl; @@ -96,7 +96,7 @@ void LLLogChat::loadHistory(LLString filename , void (*callback)(ELogLineType,LL llerrs << "Filename is Empty!" << llendl; } - FILE* fptr = LLFile::fopen(makeLogFileName(filename).c_str(), "r"); /*Flawfinder: ignore*/ + LLFILE* fptr = LLFile::fopen(makeLogFileName(filename).c_str(), "r"); /*Flawfinder: ignore*/ if (!fptr) { //LLUIString message = LLFloaterChat::getInstance()->getUIString("IM_logging_string"); diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp index 887db4cf95..c6c417d8f2 100644 --- a/indra/newview/llmanip.cpp +++ b/indra/newview/llmanip.cpp @@ -391,7 +391,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z) if (draw_x) { gGL.color4f(1.f, 0.f, 0.f, LINE_ALPHA); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex3f( -region_size, 0.f, 0.f ); gGL.vertex3f( region_size, 0.f, 0.f ); gGL.end(); @@ -400,7 +400,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z) if (draw_y) { gGL.color4f(0.f, 1.f, 0.f, LINE_ALPHA); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex3f( 0.f, -region_size, 0.f ); gGL.vertex3f( 0.f, region_size, 0.f ); gGL.end(); @@ -409,7 +409,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z) if (draw_z) { gGL.color4f(0.f, 0.f, 1.f, LINE_ALPHA); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex3f( 0.f, 0.f, -region_size ); gGL.vertex3f( 0.f, 0.f, region_size ); gGL.end(); diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp index d98de5cb80..8bb5b18e8f 100644 --- a/indra/newview/llmaniprotate.cpp +++ b/indra/newview/llmaniprotate.cpp @@ -868,7 +868,7 @@ void LLManipRotate::renderSnapGuides() LLVector3 outer_point; LLVector3 text_point; LLQuaternion rot(deg * DEG_TO_RAD, constraint_axis); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { inner_point = (projected_snap_axis * mRadiusMeters * SNAP_GUIDE_INNER_RADIUS * rot) + center; F32 tick_length = 0.f; @@ -1046,7 +1046,7 @@ void LLManipRotate::renderSnapGuides() object_axis = object_axis * SNAP_GUIDE_INNER_RADIUS * mRadiusMeters + center; LLVector3 line_start = center; - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.vertex3fv(line_start.mV); gGL.vertex3fv(object_axis.mV); @@ -1054,7 +1054,7 @@ void LLManipRotate::renderSnapGuides() gGL.end(); // draw snap guide arrow - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); { LLVector3 arrow_dir; LLVector3 arrow_span = (object_axis - line_start) % getConstraintAxis(); @@ -1074,7 +1074,7 @@ void LLManipRotate::renderSnapGuides() { LLGLDepthTest gls_depth(GL_TRUE); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.vertex3fv(line_start.mV); gGL.vertex3fv(object_axis.mV); @@ -1082,7 +1082,7 @@ void LLManipRotate::renderSnapGuides() gGL.end(); // draw snap guide arrow - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); { LLVector3 arrow_dir; LLVector3 arrow_span = (object_axis - line_start) % getConstraintAxis(); diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp index a2d6909b28..d857ca7510 100644 --- a/indra/newview/llmanipscale.cpp +++ b/indra/newview/llmanipscale.cpp @@ -600,7 +600,7 @@ void LLManipScale::renderFaces( const LLBBox& bbox ) { gGL.color4fv( default_normal_color.mV ); LLGLDepthTest gls_depth(GL_FALSE); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { // Face 0 gGL.vertex3f(min.mV[VX], max.mV[VY], max.mV[VZ]); @@ -1534,7 +1534,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox) { LLColor4 tick_color = setupSnapGuideRenderPass(pass); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); LLVector3 line_mid = mScaleCenter + (mScaleSnapValue * mScaleDir) + (mSnapGuideDir1 * mSnapRegimeOffset); LLVector3 line_start = line_mid - (mScaleDir * (llmin(mScaleSnapValue, mSnapGuideLength * 0.5f))); LLVector3 line_end = line_mid + (mScaleDir * llmin(max_point_on_scale_line - mScaleSnapValue, mSnapGuideLength * 0.5f)); @@ -1585,7 +1585,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox) if (mInSnapRegime) { // draw snap guide line - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); LLVector3 snap_line_center = mScaleCenter + (mScaleSnapValue * mScaleDir); LLVector3 snap_line_start = snap_line_center + (mSnapGuideDir1 * mSnapRegimeOffset); @@ -1599,7 +1599,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox) gGL.end(); // draw snap guide arrow - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); { //gGLSNoCullFaces.set(); gGL.color4f(1.f, 1.f, 1.f, grid_alpha); @@ -1634,7 +1634,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox) start_tick = -(llmin(ticks_from_scale_center_1, num_ticks_per_side1)); stop_tick = llmin(max_ticks1, num_ticks_per_side1); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); // draw first row of ticks for (S32 i = start_tick; i <= stop_tick; i++) { diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index c55f9f806a..1659cc71ce 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -1253,7 +1253,7 @@ void LLManipTranslate::renderSnapGuides() { LLColor4 line_color = setupSnapGuideRenderPass(pass); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { LLVector3 line_start = selection_center + (mSnapOffsetMeters * mSnapOffsetAxis) + (translate_axis * (guide_size_meters * 0.5f + offset_nearest_grid_unit)); LLVector3 line_end = selection_center + (mSnapOffsetMeters * mSnapOffsetAxis) - (translate_axis * (guide_size_meters * 0.5f + offset_nearest_grid_unit)); @@ -1329,7 +1329,7 @@ void LLManipTranslate::renderSnapGuides() LLVector3 line_start = selection_center - mSnapOffsetAxis * mSnapOffsetMeters; LLVector3 line_end = selection_center + mSnapOffsetAxis * mSnapOffsetMeters; - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.color4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW]); @@ -1339,7 +1339,7 @@ void LLManipTranslate::renderSnapGuides() gGL.end(); // draw snap guide arrow - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); { gGL.color4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW]); @@ -1594,7 +1594,7 @@ void LLManipTranslate::renderGrid(F32 x, F32 y, F32 size, F32 r, F32 g, F32 b, F for (F32 xx = -size-d; xx < size+d; xx += d) { - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); for (F32 yy = -size-d; yy < size+d; yy += d) { float dx, dy, da; @@ -1640,7 +1640,7 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal, GLuint stencil_mask = 0xFFFFFFFF; //stencil in volumes - gGL.stop(); + gGL.flush(); { glStencilMask(stencil_mask); glClearStencil(1); @@ -1702,7 +1702,7 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal, glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE); } - gGL.start(); + gGL.color4f(1,1,1,1); gGL.pushMatrix(); @@ -1907,7 +1907,7 @@ void LLManipTranslate::renderTranslationHandles() color1.setVec(0.f, 1.f, 0.f, 0.6f); color2.setVec(0.f, 0.f, 1.f, 0.6f); } - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); { gGL.color4fv(color1.mV); gGL.vertex3f(0.f, mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f)); @@ -1922,7 +1922,7 @@ void LLManipTranslate::renderTranslationHandles() gGL.end(); LLUI::setLineWidth(3.0f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.color4f(0.f, 0.f, 0.f, 0.3f); gGL.vertex3f(0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f); @@ -1962,7 +1962,7 @@ void LLManipTranslate::renderTranslationHandles() color2.setVec(1.f, 0.f, 0.f, 0.6f); } - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); { gGL.color4fv(color1.mV); gGL.vertex3f(mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f), 0.f, mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f)); @@ -1977,7 +1977,7 @@ void LLManipTranslate::renderTranslationHandles() gGL.end(); LLUI::setLineWidth(3.0f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.color4f(0.f, 0.f, 0.f, 0.3f); gGL.vertex3f(mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f, 0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f); @@ -2041,7 +2041,7 @@ void LLManipTranslate::renderTranslationHandles() color2.setVec(0.f, 0.8f, 0.f, 0.6f); } - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); { gGL.color4fv(color1.mV); gGL.vertex3fv(v0.mV); @@ -2056,7 +2056,7 @@ void LLManipTranslate::renderTranslationHandles() gGL.end(); LLUI::setLineWidth(3.0f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { gGL.color4f(0.f, 0.f, 0.f, 0.3f); LLVector3 v12 = (v1 + v2) * .5f; @@ -2190,7 +2190,7 @@ void LLManipTranslate::renderArrow(S32 which_arrow, S32 selected_arrow, F32 box_ { LLUI::setLineWidth(2.0f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); vec.mV[index] = box_size; gGL.vertex3f(vec.mV[0], vec.mV[1], vec.mV[2]); diff --git a/indra/newview/llmemoryview.cpp b/indra/newview/llmemoryview.cpp index e124af1427..ccaed78727 100644 --- a/indra/newview/llmemoryview.cpp +++ b/indra/newview/llmemoryview.cpp @@ -58,7 +58,7 @@ mDelay(120) #ifdef MEM_DUMP_DATA // clear out file. - FILE *dump = fopen("memusagedump.txt", "w"); + LLFILE *dump = LLFile::fopen("memusagedump.txt", "w"); fclose(dump); #endif } @@ -262,7 +262,7 @@ void LLMemoryView::dumpData() // reset timer mDumpTimer.reset(); // append dump info to text file - FILE *dump = fopen("memusagedump.txt", "a"); + LLFILE *dump = LLFile::fopen("memusagedump.txt", "a"); if (dump) { diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index 6edd9d0b7d..71c93c3542 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -550,7 +550,7 @@ BOOL LLMuteList::loadFromFile(const LLString& filename) return FALSE; } - FILE* fp = LLFile::fopen(filename.c_str(), "rb"); /*Flawfinder: ignore*/ + LLFILE* fp = LLFile::fopen(filename.c_str(), "rb"); /*Flawfinder: ignore*/ if (!fp) { llwarns << "Couldn't open mute list " << filename << llendl; @@ -600,7 +600,7 @@ BOOL LLMuteList::saveToFile(const LLString& filename) return FALSE; } - FILE* fp = LLFile::fopen(filename.c_str(), "wb"); /*Flawfinder: ignore*/ + LLFILE* fp = LLFile::fopen(filename.c_str(), "wb"); /*Flawfinder: ignore*/ if (!fp) { llwarns << "Couldn't open mute list " << filename << llendl; diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 1b2474728f..6e10bfef58 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -287,7 +287,7 @@ void LLNetMap::draw() // Draw using texture. LLViewerImage::bindTexture(regionp->getLand().getSTexture()); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.texCoord2f(0.f, 1.f); gGL.vertex2f(left, top); gGL.texCoord2f(0.f, 0.f); @@ -304,7 +304,7 @@ void LLNetMap::draw() if (regionp->getLand().getWaterTexture()) { LLViewerImage::bindTexture(regionp->getLand().getWaterTexture()); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.texCoord2f(0.f, 1.f); gGL.vertex2f(left, top); gGL.texCoord2f(0.f, 0.f); @@ -354,7 +354,7 @@ void LLNetMap::draw() F32 image_half_width = 0.5f*mObjectMapPixels; F32 image_half_height = 0.5f*mObjectMapPixels; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.texCoord2f(0.f, 1.f); gGL.vertex2f(map_center_agent.mV[VX] - image_half_width, image_half_height + map_center_agent.mV[VY]); gGL.texCoord2f(0.f, 0.f); @@ -463,7 +463,7 @@ void LLNetMap::draw() { gGL.color4fv(gFrustumMapColor.mV); - gGL.begin( GL_TRIANGLES ); + gGL.begin( LLVertexBuffer::TRIANGLES ); gGL.vertex2f( ctr_x, ctr_y ); gGL.vertex2f( ctr_x - half_width_pixels, ctr_y + far_clip_pixels ); gGL.vertex2f( ctr_x + half_width_pixels, ctr_y + far_clip_pixels ); @@ -477,7 +477,7 @@ void LLNetMap::draw() gGL.pushMatrix(); gGL.translatef( ctr_x, ctr_y, 0 ); glRotatef( atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] ) * RAD_TO_DEG, 0.f, 0.f, -1.f); - gGL.begin( GL_TRIANGLES ); + gGL.begin( LLVertexBuffer::TRIANGLES ); gGL.vertex2f( 0, 0 ); gGL.vertex2f( -half_width_pixels, far_clip_pixels ); gGL.vertex2f( half_width_pixels, far_clip_pixels ); diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp index 85d5def673..f4cbbe28c8 100644 --- a/indra/newview/llpolymesh.cpp +++ b/indra/newview/llpolymesh.cpp @@ -271,7 +271,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName ) llerrs << "Filename is Empty!" << llendl; return FALSE; } - FILE* fp = LLFile::fopen(fileName, "rb"); /*Flawfinder: ignore*/ + LLFILE* fp = LLFile::fopen(fileName, "rb"); /*Flawfinder: ignore*/ if (!fp) { llerrs << "can't open: " << fileName << llendl; diff --git a/indra/newview/llpolymorph.cpp b/indra/newview/llpolymorph.cpp index 5574ec67c7..572a495f70 100644 --- a/indra/newview/llpolymorph.cpp +++ b/indra/newview/llpolymorph.cpp @@ -83,7 +83,7 @@ LLPolyMorphData::~LLPolyMorphData() //----------------------------------------------------------------------------- // loadBinary() //----------------------------------------------------------------------------- -BOOL LLPolyMorphData::loadBinary(FILE *fp, LLPolyMeshSharedData *mesh) +BOOL LLPolyMorphData::loadBinary(LLFILE *fp, LLPolyMeshSharedData *mesh) { S32 numVertices; S32 numRead; diff --git a/indra/newview/llpolymorph.h b/indra/newview/llpolymorph.h index 088963584e..8b4493ce86 100644 --- a/indra/newview/llpolymorph.h +++ b/indra/newview/llpolymorph.h @@ -51,7 +51,7 @@ public: LLPolyMorphData(char *morph_name); ~LLPolyMorphData(); - BOOL loadBinary(FILE* fp, LLPolyMeshSharedData *mesh); + BOOL loadBinary(LLFILE* fp, LLPolyMeshSharedData *mesh); char* loadASCII(char* text, LLPolyMeshSharedData *mesh); char* getName() { return mName; } diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index e55d2b2225..2d87cae69b 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -1262,7 +1262,7 @@ void LLPreviewLSL::saveIfNeeded() std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,asset_id.asString()); std::string filename = llformat("%s.lsl", filepath.c_str()); - FILE* fp = LLFile::fopen(filename.c_str(), "wb"); + LLFILE* fp = LLFile::fopen(filename.c_str(), "wb"); if(!fp) { llwarns << "Unable to write to " << filename << llendl; @@ -1336,7 +1336,7 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename, //system(command); // load the error file into the error scrolllist - FILE* fp = LLFile::fopen(err_filename.c_str(), "r"); + LLFILE* fp = LLFile::fopen(err_filename.c_str(), "r"); if(fp) { char buffer[MAX_STRING]; /*Flawfinder: ignore*/ @@ -1851,7 +1851,7 @@ void LLLiveLSLEditor::loadScriptText(const char* filename) llerrs << "Filename is Empty!" << llendl; return; } - FILE* file = LLFile::fopen(filename, "rb"); /*Flawfinder: ignore*/ + LLFILE* file = LLFile::fopen(filename, "rb"); /*Flawfinder: ignore*/ if(file) { // read in the whole file @@ -2063,7 +2063,7 @@ void LLLiveLSLEditor::saveIfNeeded() mItem->setTransactionID(tid); // write out the data, and store it in the asset database - FILE* fp = LLFile::fopen(filename.c_str(), "wb"); + LLFILE* fp = LLFile::fopen(filename.c_str(), "wb"); if(!fp) { llwarns << "Unable to write to " << filename << llendl; @@ -2136,7 +2136,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename, std::string dst_filename = llformat("%s.lso", filepath.c_str()); std::string err_filename = llformat("%s.out", filepath.c_str()); - FILE *fp; + LLFILE *fp; if(!lscript_compile(filename.c_str(), dst_filename.c_str(), err_filename.c_str(), diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 5eacb25ded..179b1469ed 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5280,7 +5280,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color) LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GEQUAL); glAlphaFunc(GL_GREATER, 0.01f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { S32 i = 0; for (S32 seg_num = 0; seg_num < (S32)mSilhouetteSegments.size(); seg_num++) @@ -5301,7 +5301,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color) gGL.flush(); gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); { S32 i = 0; for (S32 seg_num = 0; seg_num < (S32)mSilhouetteSegments.size(); seg_num++) diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index b7cdf04de7..ff53dfea2f 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1646,7 +1646,7 @@ public: void drawBox(const LLVector3& c, const LLVector3& r) { - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); //left front gGL.vertex3fv((c+r.scaledVec(LLVector3(-1,1,-1))).mV); gGL.vertex3fv((c+r.scaledVec(LLVector3(-1,1,1))).mV); @@ -1665,7 +1665,7 @@ void drawBox(const LLVector3& c, const LLVector3& r) gGL.end(); //bottom - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); gGL.vertex3fv((c+r.scaledVec(LLVector3(1,1,-1))).mV); gGL.vertex3fv((c+r.scaledVec(LLVector3(1,-1,-1))).mV); gGL.vertex3fv((c+r.scaledVec(LLVector3(-1,1,-1))).mV); @@ -1673,7 +1673,7 @@ void drawBox(const LLVector3& c, const LLVector3& r) gGL.end(); //top - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); gGL.vertex3fv((c+r.scaledVec(LLVector3(1,1,1))).mV); gGL.vertex3fv((c+r.scaledVec(LLVector3(-1,1,1))).mV); gGL.vertex3fv((c+r.scaledVec(LLVector3(1,-1,1))).mV); @@ -1688,7 +1688,7 @@ void drawBoxOutline(const LLVector3& pos, const LLVector3& size) LLVector3 v3 = size.scaledVec(LLVector3(-1,-1,1)); LLVector3 v4 = size.scaledVec(LLVector3( 1,-1,1)); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); //top gGL.vertex3fv((pos+v1).mV); @@ -2032,7 +2032,7 @@ void renderOctree(LLSpatialGroup* group) drawBoxOutline(group->mObjectBounds[0], group->mObjectBounds[1]); gGL.flush(); glLineWidth(1.f); - gGL.stop(); + gGL.flush(); for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i) { LLDrawable* drawable = *i; @@ -2074,7 +2074,7 @@ void renderOctree(LLSpatialGroup* group) } } glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - gGL.start(); + gGL.color4f(1,1,1,1); } } else @@ -2313,7 +2313,7 @@ void renderPoints(LLDrawable* drawablep) LLGLDepthTest depth(GL_FALSE, GL_FALSE); if (drawablep->getNumFaces()) { - gGL.begin(GL_POINTS); + gGL.begin(LLVertexBuffer::POINTS); gGL.color3f(1,1,1); LLVector3 center(drawablep->getPositionGroup()); for (S32 i = 0; i < drawablep->getNumFaces(); i++) @@ -2405,14 +2405,14 @@ public: if (group->mSpatialPartition->mRenderByGroup && gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_OCCLUSION)) { - gGL.stop(); + gGL.flush(); glPushMatrix(); gGLLastMatrix = NULL; glLoadMatrixd(gGLModelView); renderVisibility(group, mCamera); gGLLastMatrix = NULL; glPopMatrix(); - gGL.start(); + gGL.color4f(1,1,1,1); } } } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 7d9bab59df..ec15ffecee 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -438,7 +438,7 @@ BOOL idle_startup() std::string message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message_template.msg"); - FILE* found_template = NULL; + LLFILE* found_template = NULL; found_template = LLFile::fopen(message_template_path.c_str(), "r"); /* Flawfinder: ignore */ if (found_template) { @@ -2439,7 +2439,7 @@ LLString load_password_from_disk() std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "password.dat"); - FILE* fp = LLFile::fopen(filepath.c_str(), "rb"); /* Flawfinder: ignore */ + LLFILE* fp = LLFile::fopen(filepath.c_str(), "rb"); /* Flawfinder: ignore */ if (!fp) { return hashed_password; @@ -2486,7 +2486,7 @@ void save_password_to_disk(const char* hashed_password) } else { - FILE* fp = LLFile::fopen(filepath.c_str(), "wb"); /* Flawfinder: ignore */ + LLFILE* fp = LLFile::fopen(filepath.c_str(), "wb"); /* Flawfinder: ignore */ if (!fp) { return; diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index f8931cb18b..7a2d232de6 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -244,8 +244,6 @@ BOOL LLTexLayerSetBuffer::render() BOOL upload_now = (gAgent.mNumPendingQueries == 0 && mNeedsUpload && mTexLayerSet->isLocalTextureDataFinal()); BOOL success = TRUE; - gGL.start(); - // Composite bump if( mBumpTexName ) { @@ -297,8 +295,6 @@ BOOL LLTexLayerSetBuffer::render() glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE ); gGL.blendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - gGL.stop(); - // we have valid texture data now mInitialized = TRUE; mNeedsUpdate = FALSE; diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index a654dbc2cd..6625e10982 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -484,7 +484,7 @@ void LLFloaterTexturePicker::draw() { LLGLSNoTexture no_texture; LLGLEnable(GL_CULL_FACE); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.color4f(0.f, 0.f, 0.f, CONTEXT_CONE_IN_ALPHA * mContextConeOpacity); gGL.vertex2i(owner_rect.mLeft, owner_rect.mTop); diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp index a15b01ca04..0224e1c925 100644 --- a/indra/newview/lltoolbrush.cpp +++ b/indra/newview/lltoolbrush.cpp @@ -482,7 +482,7 @@ void LLToolBrushLand::renderOverlay(LLSurface& land, const LLVector3& pos_region S32 j = (S32) pos_region.mV[VY]; S32 half_edge = llfloor(LAND_BRUSH_SIZE[mBrushIndex]); - gGL.begin(GL_POINTS); + gGL.begin(LLVertexBuffer::POINTS); for(S32 di = -half_edge; di <= half_edge; di++) { if((i+di) < 0 || (i+di) >= (S32)land.mGridsPerEdge) continue; diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp index 85ea204645..ad11f5ad43 100644 --- a/indra/newview/lltoolmorph.cpp +++ b/indra/newview/lltoolmorph.cpp @@ -163,8 +163,6 @@ void LLVisualParamHint::preRender(BOOL clear_depth) //----------------------------------------------------------------------------- BOOL LLVisualParamHint::render() { - gGL.start(); - LLVisualParamReset::sDirty = TRUE; LLVOAvatar* avatarp = gAgent.getAvatarObject(); @@ -224,7 +222,7 @@ BOOL LLVisualParamHint::render() mVisualParam->getCameraElevation() ); LLVector3 camera_pos = target_joint_pos + (camera_snapshot_offset * avatar_rotation); - gGL.stop(); + gGL.flush(); LLViewerCamera::getInstance()->setAspect((F32)mWidth / (F32)mHeight); LLViewerCamera::getInstance()->setOriginAndLookAt( @@ -241,7 +239,7 @@ BOOL LLVisualParamHint::render() avatarPoolp->renderAvatars(avatarp); // renders only one avatar } avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight); - + gGL.color4f(1,1,1,1); return TRUE; } @@ -258,7 +256,7 @@ void LLVisualParamHint::draw() gGL.color4f(1.f, 1.f, 1.f, 1.f); LLGLSUIDefault gls_ui; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.texCoord2i(0, 1); gGL.vertex2i(0, mHeight); diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index 40ae4e49a6..874608d066 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -444,7 +444,7 @@ void draw_shockwave(F32 center_z, F32 t, S32 steps, LLColor4 color) F32 y = 0.f; LLColor4 ccol = LLColor4(1,1,1,(1.f-t)*0.25f); - gGL.begin(GL_TRIANGLE_FAN); + gGL.begin(LLVertexBuffer::TRIANGLE_FAN); gGL.color4fv(ccol.mV); gGL.vertex3f(0.f, 0.f, center_z); // make sure circle is complete @@ -534,7 +534,7 @@ void LLTracker::renderBeacon(LLVector3d pos_global, an *= 2.f; an += 1.0f+dr; - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); gGL.color4fv(col_edge.mV); gGL.vertex3f(-x*a, -y*a, z); gGL.color4fv(col_edge_next.mV); diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp index c015004a71..39e0bd8555 100644 --- a/indra/newview/llviewerassetstorage.cpp +++ b/indra/newview/llviewerassetstorage.cpp @@ -202,7 +202,7 @@ if(!filename) llinfos << "ASSET_ID: " << asset_id << llendl; S32 size = 0; - FILE* fp = LLFile::fopen(filename, "rb"); + LLFILE* fp = LLFile::fopen(filename, "rb"); if (fp) { fseek(fp, 0, SEEK_END); diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index b834eb7e2e..9ba25902af 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -86,6 +86,7 @@ LLString gLastRunVersion; LLString gCurrentVersion; extern BOOL gResizeScreenTexture; +extern BOOL gDebugGL; //////////////////////////////////////////////////////////////////////////// // Listeners @@ -357,9 +358,15 @@ static bool handleRenderUseImpostorsChanged(const LLSD& newvalue) return true; } -static bool handleRenderUseCleverUIChanged(const LLSD& newvalue) +static bool handleRenderDebugGLChanged(const LLSD& newvalue) { - gGL.setClever(newvalue.asBoolean()); + gDebugGL = newvalue.asBoolean(); + return true; +} + +static bool handleRenderDebugPipelineChanged(const LLSD& newvalue) +{ + gDebugPipeline = newvalue.asBoolean(); return true; } @@ -464,7 +471,8 @@ void settings_setup_listeners() gSavedSettings.getControl("RenderMaxVBOSize")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _1)); gSavedSettings.getControl("RenderUseFBO")->getSignal()->connect(boost::bind(&handleRenderUseFBOChanged, _1)); gSavedSettings.getControl("RenderUseImpostors")->getSignal()->connect(boost::bind(&handleRenderUseImpostorsChanged, _1)); - gSavedSettings.getControl("RenderUseCleverUI")->getSignal()->connect(boost::bind(&handleRenderUseCleverUIChanged, _1)); + gSavedSettings.getControl("RenderDebugGL")->getSignal()->connect(boost::bind(&handleRenderDebugGLChanged, _1)); + gSavedSettings.getControl("RenderDebugPipeline")->getSignal()->connect(boost::bind(&handleRenderDebugPipelineChanged, _1)); gSavedSettings.getControl("RenderResolutionDivisor")->getSignal()->connect(boost::bind(&handleRenderResolutionDivisorChanged, _1)); gSavedSettings.getControl("RenderDeferred")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1)); gSavedSettings.getControl("AvatarCompositeLimit")->getSignal()->connect(boost::bind(&handleCompositeLimitChanged, _1)); diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 152c614c08..a24f4b36de 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -125,20 +125,17 @@ void display_startup() // Required for HTML update in login screen static S32 frame_count = 0; -#ifndef LL_RELEASE_FOR_DOWNLOAD + LLGLState::checkStates(); LLGLState::checkTextureChannels(); -#endif if (frame_count++ > 1) // make sure we have rendered a frame first { LLDynamicTexture::updateAllInstances(); } -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); -#endif glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); LLGLSUIDefault gls_ui; @@ -147,14 +144,14 @@ void display_startup() gViewerWindow->setup2DRender(); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - gGL.start(); + gGL.color4f(1,1,1,1); gViewerWindow->draw(); - gGL.stop(); + gGL.flush(); + + LLVertexBuffer::unbind(); -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); -#endif gViewerWindow->mWindow->swapBuffers(); glClear(GL_DEPTH_BUFFER_BIT); @@ -199,16 +196,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) LLGLSDefault gls_default; LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE, GL_LEQUAL); - - // No clue where this is getting unset, but safe enough to reset it here. - //this causes frame stalls, try real hard not to uncomment this line - DaveP - //LLGLState::resetTextureStates(); - -#ifndef LL_RELEASE_FOR_DOWNLOAD + LLVertexBuffer::unbind(); + LLGLState::checkStates(); LLGLState::checkTextureChannels(); -#endif gPipeline.disableLights(); @@ -233,10 +225,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) gViewerWindow->performPick(); -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); -#endif ////////////////////////////////////////////////////////// // @@ -676,7 +666,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) // glTranslatef(0.f, 0.f, -LLViewerCamera::getInstance()->getNear()); // glScalef(LLViewerCamera::getInstance()->getNear() * LLViewerCamera::getInstance()->getAspect() / sinf(LLViewerCamera::getInstance()->getView()), LLViewerCamera::getInstance()->getNear() / sinf(LLViewerCamera::getInstance()->getView()), 1.f); // gGL.color4fv(LLColor4::white.mV); - // gGL.begin(GL_QUADS); + // gGL.begin(LLVertexBuffer::QUADS); // { // gGL.vertex3f(floater_3d_rect.mLeft, floater_3d_rect.mBottom, 0.f); // gGL.vertex3f(floater_3d_rect.mLeft, floater_3d_rect.mTop, 0.f); @@ -881,9 +871,7 @@ BOOL setup_hud_matrices(BOOL for_select) void render_ui_and_swap() { -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); -#endif glPushMatrix(); glLoadMatrixd(gGLLastModelView); @@ -910,8 +898,8 @@ void render_ui_and_swap() } { - LLVertexBuffer::startRender(); - gGL.start(); + + gGL.color4f(1,1,1,1); if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI)) { LLFastTimer t(LLFastTimer::FTM_RENDER_UI); @@ -919,17 +907,13 @@ void render_ui_and_swap() if (!gDisconnected) { render_ui_3d(); -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); -#endif } render_ui_2d(); -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); -#endif } - gGL.stop(); + gGL.flush(); { gViewerWindow->setup2DRender(); @@ -937,7 +921,7 @@ void render_ui_and_swap() gViewerWindow->drawDebugText(); } - LLVertexBuffer::stopRender(); + LLVertexBuffer::unbind(); } glh_set_current_modelview(saved_view); @@ -960,7 +944,7 @@ void render_ui_and_swap_if_needed() void renderCoordinateAxes() { LLGLSNoTexture gls_no_texture; - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.color3f(1.0f, 0.0f, 0.0f); // i direction = X-Axis = red gGL.vertex3f(0.0f, 0.0f, 0.0f); gGL.vertex3f(2.0f, 0.0f, 0.0f); @@ -1013,7 +997,7 @@ void draw_axes() LLGLSNoTexture gls_no_texture; // A vertical white line at origin LLVector3 v = gAgent.getPositionAgent(); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.color3f(1.0f, 1.0f, 1.0f); gGL.vertex3f(0.0f, 0.0f, 0.0f); gGL.vertex3f(0.0f, 0.0f, 40.0f); @@ -1119,7 +1103,7 @@ void render_ui_2d() void render_disconnected_background() { - gGL.start(); + gGL.color4f(1,1,1,1); if (!gDisconnectedImagep && gDisconnected) { llinfos << "Loading last bitmap..." << llendl; @@ -1192,7 +1176,7 @@ void render_disconnected_background() } glPopMatrix(); } - gGL.stop(); + gGL.flush(); } void display_cleanup() diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index aeffcd6c56..097b3b1a9d 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -254,7 +254,7 @@ void LLViewerInventoryItem::packMessage(LLMessageSystem* msg) const msg->addU32Fast(_PREHASH_CRC, crc); } // virtual -BOOL LLViewerInventoryItem::importFile(FILE* fp) +BOOL LLViewerInventoryItem::importFile(LLFILE* fp) { BOOL rv = LLInventoryItem::importFile(fp); mIsComplete = TRUE; @@ -269,7 +269,7 @@ BOOL LLViewerInventoryItem::importLegacyStream(std::istream& input_stream) return rv; } -bool LLViewerInventoryItem::importFileLocal(FILE* fp) +bool LLViewerInventoryItem::importFileLocal(LLFILE* fp) { // TODO: convert all functions that return BOOL to return bool bool rv = (LLInventoryItem::importFile(fp) ? true : false); @@ -277,7 +277,7 @@ bool LLViewerInventoryItem::importFileLocal(FILE* fp) return rv; } -bool LLViewerInventoryItem::exportFileLocal(FILE* fp) const +bool LLViewerInventoryItem::exportFileLocal(LLFILE* fp) const { char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ fprintf(fp, "\tinv_item\t0\n\t{\n"); @@ -469,7 +469,7 @@ bool LLViewerInventoryCategory::fetchDescendents() return false; } -bool LLViewerInventoryCategory::importFileLocal(FILE* fp) +bool LLViewerInventoryCategory::importFileLocal(LLFILE* fp) { // *NOTE: This buffer size is hard coded into scanf() below. char buffer[MAX_STRING]; /* Flawfinder: ignore */ @@ -538,7 +538,7 @@ bool LLViewerInventoryCategory::importFileLocal(FILE* fp) return true; } -bool LLViewerInventoryCategory::exportFileLocal(FILE* fp) const +bool LLViewerInventoryCategory::exportFileLocal(LLFILE* fp) const { char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ fprintf(fp, "\tinv_category\t0\n\t{\n"); diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 24c33bf292..30e5afdad1 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -100,13 +100,13 @@ public: //virtual void packMessage(LLMessageSystem* msg) const; virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0); virtual BOOL unpackMessage(LLSD item); - virtual BOOL importFile(FILE* fp); + virtual BOOL importFile(LLFILE* fp); virtual BOOL importLegacyStream(std::istream& input_stream); // file handling on the viewer. These are not meant for anything // other than cacheing. - bool exportFileLocal(FILE* fp) const; - bool importFileLocal(FILE* fp); + bool exportFileLocal(LLFILE* fp) const; + bool importFileLocal(LLFILE* fp); // new methods BOOL isComplete() const { return mIsComplete; } @@ -182,8 +182,8 @@ public: // file handling on the viewer. These are not meant for anything // other than cacheing. - bool exportFileLocal(FILE* fp) const; - bool importFileLocal(FILE* fp); + bool exportFileLocal(LLFILE* fp) const; + bool importFileLocal(LLFILE* fp); protected: LLUUID mOwnerID; diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp index b1cad86a61..9bf392249e 100644 --- a/indra/newview/llviewerjoint.cpp +++ b/indra/newview/llviewerjoint.cpp @@ -148,7 +148,7 @@ void LLViewerJoint::renderSkeleton(BOOL recursive) //---------------------------------------------------------------- if (mComponents & SC_AXES) { - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.color3f( 1.0f, 0.0f, 0.0f ); gGL.vertex3f( 0.0f, 0.0f, 0.0f ); gGL.vertex3f( 0.1f, 0.0f, 0.0f ); @@ -170,7 +170,7 @@ void LLViewerJoint::renderSkeleton(BOOL recursive) { gGL.color3f( 1.0f, 1.0f, 0.0f ); - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); // joint top half glNormal3f(nc, nc, nc); @@ -360,7 +360,7 @@ void LLViewerJoint::drawBone() // render the bone gGL.color3f( 0.5f, 0.5f, 0.0f ); - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); gGL.vertex3f( length, 0.0f, 0.0f); gGL.vertex3f( 0.0f, boneSize, 0.0f); diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp index 7ec60a31d1..9e5c207f7d 100644 --- a/indra/newview/llviewerjointattachment.cpp +++ b/indra/newview/llviewerjointattachment.cpp @@ -92,7 +92,7 @@ U32 LLViewerJointAttachment::drawShape( F32 pixelArea, BOOL first_pass ) LLGLDisable cull_face(GL_CULL_FACE); gGL.color4f(1.f, 1.f, 1.f, 1.f); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); { gGL.vertex3f(-0.1f, 0.1f, 0.f); gGL.vertex3f(-0.1f, -0.1f, 0.f); diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index e21c14637b..00473439a3 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -738,7 +738,7 @@ BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, c S32 LLViewerKeyboard::loadBindings(const char *filename) { - FILE *fp; + LLFILE *fp; const S32 BUFFER_SIZE = 2048; char buffer[BUFFER_SIZE]; /* Flawfinder: ignore */ // *NOTE: This buffer size is hard coded into scanf() below. diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 0a7a14dbfa..ab796f184f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -1429,6 +1429,12 @@ void init_debug_rendering_menu(LLMenuGL* menu) item = new LLMenuItemCheckGL("Object-Object Occlusion", menu_toggle_control, NULL, menu_check_control, (void*)"UseOcclusion", 'O', MASK_CONTROL|MASK_SHIFT); item->setEnabled(gGLManager.mHasOcclusionQuery && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion")); menu->append(item); + + item = new LLMenuItemCheckGL("Debug GL", menu_toggle_control, NULL, menu_check_control, (void*)"RenderDebugGL"); + menu->append(item); + + item = new LLMenuItemCheckGL("Debug Pipeline", menu_toggle_control, NULL, menu_check_control, (void*)"RenderDebugPipeline"); + menu->append(item); item = new LLMenuItemCheckGL("Fast Alpha", menu_toggle_control, NULL, menu_check_control, (void*)"RenderFastAlpha"); menu->append(item); diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 6a0b5280ab..864c1dd570 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -591,7 +591,7 @@ void upload_new_resource(const LLString& src_filename, std::string name, { // This is a generic .lin resource file asset_type = LLAssetType::AT_OBJECT; - FILE* in = LLFile::fopen(src_filename.c_str(), "rb"); /* Flawfinder: ignore */ + LLFILE* in = LLFile::fopen(src_filename.c_str(), "rb"); /* Flawfinder: ignore */ if (in) { // read in the file header @@ -676,7 +676,7 @@ void upload_new_resource(const LLString& src_filename, std::string name, } // copy the file's data segment into another file for uploading - FILE* out = LLFile::fopen(filename.c_str(), "wb"); /* Flawfinder: ignore */ + LLFILE* out = LLFile::fopen(filename.c_str(), "wb"); /* Flawfinder: ignore */ if (out) { while((read = fread(buf, 1, 16384, in))) /* Flawfinder: ignore */ diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 5b16b81639..e09af2ea45 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -345,7 +345,7 @@ void export_complete() gExporterRequestID.setNull(); gExportDirectory = ""; - FILE* fXML = LLFile::fopen(gExportedFile.c_str(), "rb"); /* Flawfinder: ignore */ + LLFILE* fXML = LLFile::fopen(gExportedFile.c_str(), "rb"); /* Flawfinder: ignore */ fseek(fXML, 0, SEEK_END); long length = ftell(fXML); fseek(fXML, 0, SEEK_SET); @@ -390,7 +390,7 @@ void export_complete() } } - FILE* fXMLOut = LLFile::fopen(gExportedFile.c_str(), "wb"); /* Flawfinder: ignore */ + LLFILE* fXMLOut = LLFile::fopen(gExportedFile.c_str(), "wb"); /* Flawfinder: ignore */ if (fwrite(buffer, 1, length, fXMLOut) != length) { llwarns << "Short write" << llendl; @@ -446,7 +446,7 @@ void exported_j2c_complete(const LLTSCode status, void *user_data) } else { - FILE* fIn = LLFile::fopen(filename.c_str(), "rb"); /* Flawfinder: ignore */ + LLFILE* fIn = LLFile::fopen(filename.c_str(), "rb"); /* Flawfinder: ignore */ if (fIn) { LLPointer<LLImageJ2C> ImageUtility = new LLImageJ2C; @@ -481,7 +481,7 @@ void exported_j2c_complete(const LLTSCode status, void *user_data) delete [] file_path; //S32 name_len = output_file.length(); //strcpy(&output_file[name_len-3], "tga"); - FILE* fOut = LLFile::fopen(output_file.c_str(), "wb"); /* Flawfinder: ignore */ + LLFILE* fOut = LLFile::fopen(output_file.c_str(), "wb"); /* Flawfinder: ignore */ char md5_hash_string[33]; /* Flawfinder: ignore */ strcpy(md5_hash_string, "00000000000000000000000000000000"); /* Flawfinder: ignore */ if (fOut) diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 499476e065..8398c3c9d7 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1206,12 +1206,12 @@ U32 LLViewerObjectList::renderObjectsForSelect(LLCamera &camera, BOOL pick_parce // // Render pass for selected objects // - gGL.start(); + gGL.color4f(1,1,1,1); gViewerWindow->renderSelections( TRUE, pick_parcel_wall, FALSE ); // render pickable ui elements, like names, etc. LLHUDObject::renderAllForSelect(); - gGL.stop(); + gGL.flush(); gRenderForSelect = FALSE; diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp index b105267723..d190d2f12c 100644 --- a/indra/newview/llviewerparceloverlay.cpp +++ b/indra/newview/llviewerparceloverlay.cpp @@ -824,7 +824,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines () continue; } - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); for (j = 0; j < vertex_per_edge; j++) { @@ -844,7 +844,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines () colorp = mColorArray + BYTES_PER_COLOR * i; vertexp = mVertexArray + FLOATS_PER_VERTEX * i; - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); for (j = 0; j < vertex_per_edge; j++) { diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 4b7c849171..5d7bac7ab3 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -214,7 +214,7 @@ void LLViewerRegion::loadCache() U32(mHandle>>32)/REGION_WIDTH_UNITS, U32(mHandle)/REGION_WIDTH_UNITS ); - FILE* fp = LLFile::fopen(filename, "rb"); /* Flawfinder: ignore */ + LLFILE* fp = LLFile::fopen(filename, "rb"); /* Flawfinder: ignore */ if (!fp) { // might not have a file, which is normal @@ -303,7 +303,7 @@ void LLViewerRegion::saveCache() U32(mHandle>>32)/REGION_WIDTH_UNITS, U32(mHandle)/REGION_WIDTH_UNITS ); - FILE* fp = LLFile::fopen(filename, "wb"); /* Flawfinder: ignore */ + LLFILE* fp = LLFile::fopen(filename, "wb"); /* Flawfinder: ignore */ if (!fp) { llwarns << "Unable to write cache file " << filename << llendl; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index e403df7f45..0e39c9d5d4 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2243,7 +2243,7 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid) void LLViewerWindow::drawDebugText() { - gGL.start(); + gGL.color4f(1,1,1,1); gGL.pushMatrix(); { // scale view by UI global scale factor and aspect ratio correction factor @@ -2251,7 +2251,7 @@ void LLViewerWindow::drawDebugText() mDebugText->draw(); } gGL.popMatrix(); - gGL.stop(); + gGL.flush(); } void LLViewerWindow::draw() @@ -5019,20 +5019,16 @@ BOOL LLViewerWindow::checkSettings() return FALSE; } -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); -#endif changeDisplaySettings(TRUE, LLCoordScreen(gSavedSettings.getS32("FullScreenWidth"), gSavedSettings.getS32("FullScreenHeight")), gSavedSettings.getBOOL("DisableVerticalSync"), mShowFullscreenProgress); -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); -#endif return TRUE; } return FALSE; @@ -5213,7 +5209,7 @@ void LLViewerWindow::drawPickBuffer() const { if (mPickBuffer) { - gGL.start(); + gGL.color4f(1,1,1,1); gGL.pushMatrix(); LLGLDisable no_blend(GL_BLEND); LLGLDisable no_alpha_test(GL_ALPHA_TEST); @@ -5249,7 +5245,7 @@ void LLViewerWindow::drawPickBuffer() const llround((F32)mPickPoint.mY * mDisplayScale.mV[VY] + (F32)(PICK_HALF_WIDTH + mPickOffset.mY) * 10.f), FALSE); gGL.popMatrix(); - gGL.stop(); + gGL.flush(); } } diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index afe5f5f9fb..292fa83918 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4056,7 +4056,7 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass) LLVector3 collide_point = slaved_pos; collide_point.mV[VZ] -= foot_plane_normal.mV[VZ] * (dist_from_plane + COLLISION_TOLERANCE - FOOT_COLLIDE_FUDGE); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); { F32 SQUARE_SIZE = 0.2f; gGL.color4f(1.f, 0.f, 0.f, 1.f); @@ -4229,10 +4229,10 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color) LLGLEnable test(GL_ALPHA_TEST); glAlphaFunc(GL_GREATER, 0.f); - gGL.start(); + gGL.color4f(1,1,1,1); gGL.color4ubv(color.mV); mImpostor.bindTexture(); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.texCoord2f(0,0); gGL.vertex3fv((pos+left-up).mV); gGL.texCoord2f(1,0); @@ -4242,7 +4242,7 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color) gGL.texCoord2f(0,1); gGL.vertex3fv((pos+left+up).mV); gGL.end(); - gGL.stop(); + gGL.flush(); return 6; } diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index 79c7594a0f..a0a4cc4b64 100644 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -63,7 +63,7 @@ LLVOCacheEntry::LLVOCacheEntry() } -static inline void checkedRead(FILE *fp, void *data, size_t nbytes) +static inline void checkedRead(LLFILE *fp, void *data, size_t nbytes) { if (fread(data, 1, nbytes, fp) != nbytes) { @@ -72,7 +72,7 @@ static inline void checkedRead(FILE *fp, void *data, size_t nbytes) } } -LLVOCacheEntry::LLVOCacheEntry(FILE *fp) +LLVOCacheEntry::LLVOCacheEntry(LLFILE *fp) { S32 size; checkedRead(fp, &mLocalID, sizeof(U32)); @@ -153,7 +153,7 @@ void LLVOCacheEntry::dump() const << llendl; } -static inline void checkedWrite(FILE *fp, const void *data, size_t nbytes) +static inline void checkedWrite(LLFILE *fp, const void *data, size_t nbytes) { if (fwrite(data, 1, nbytes, fp) != nbytes) { @@ -161,7 +161,7 @@ static inline void checkedWrite(FILE *fp, const void *data, size_t nbytes) } } -void LLVOCacheEntry::writeToFile(FILE *fp) const +void LLVOCacheEntry::writeToFile(LLFILE *fp) const { checkedWrite(fp, &mLocalID, sizeof(U32)); checkedWrite(fp, &mCRC, sizeof(U32)); diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h index 809b82a6d9..d2b8f5681c 100644 --- a/indra/newview/llvocache.h +++ b/indra/newview/llvocache.h @@ -45,7 +45,7 @@ class LLVOCacheEntry : public LLDLinked<LLVOCacheEntry> { public: LLVOCacheEntry(U32 local_id, U32 crc, LLDataPackerBinaryBuffer &dp); - LLVOCacheEntry(FILE *fp); + LLVOCacheEntry(LLFILE *fp); LLVOCacheEntry(); ~LLVOCacheEntry(); @@ -55,7 +55,7 @@ public: S32 getCRCChangeCount() const { return mCRCChangeCount; } void dump() const; - void writeToFile(FILE *fp) const; + void writeToFile(LLFILE *fp) const; void assignCRC(U32 crc, LLDataPackerBinaryBuffer &dp); LLDataPackerBinaryBuffer *getDP(U32 crc); void recordHit(); diff --git a/indra/newview/llvograss.h b/indra/newview/llvograss.h index a1dab634be..1a14241409 100644 --- a/indra/newview/llvograss.h +++ b/indra/newview/llvograss.h @@ -56,8 +56,8 @@ public: U32 block_num, const EObjectUpdateType update_type, LLDataPacker *dp); - static void import(FILE *file, LLMessageSystem *mesgsys, const LLVector3 &pos); - /*virtual*/ void exportFile(FILE *file, const LLVector3 &position); + static void import(LLFILE *file, LLMessageSystem *mesgsys, const LLVector3 &pos); + /*virtual*/ void exportFile(LLFILE *file, const LLVector3 &position); void updateDrawable(BOOL force_damped); diff --git a/indra/newview/llvoicevisualizer.cpp b/indra/newview/llvoicevisualizer.cpp index 87f0ffdbee..a0286d3e4b 100644 --- a/indra/newview/llvoicevisualizer.cpp +++ b/indra/newview/llvoicevisualizer.cpp @@ -393,13 +393,13 @@ void LLVoiceVisualizer::render() //------------------------------------------------------------- gGL.color4fv( LLColor4( 1.0f, 1.0f, 1.0f, DOT_OPACITY ).mV ); - gGL.begin( GL_TRIANGLE_STRIP ); + gGL.begin( LLVertexBuffer::TRIANGLE_STRIP ); gGL.texCoord2i( 0, 0 ); gGL.vertex3fv( bottomLeft.mV ); gGL.texCoord2i( 1, 0 ); gGL.vertex3fv( bottomRight.mV ); gGL.texCoord2i( 0, 1 ); gGL.vertex3fv( topLeft.mV ); gGL.end(); - gGL.begin( GL_TRIANGLE_STRIP ); + gGL.begin( LLVertexBuffer::TRIANGLE_STRIP ); gGL.texCoord2i( 1, 0 ); gGL.vertex3fv( bottomRight.mV ); gGL.texCoord2i( 1, 1 ); gGL.vertex3fv( topRight.mV ); gGL.texCoord2i( 0, 1 ); gGL.vertex3fv( topLeft.mV ); @@ -516,13 +516,13 @@ void LLVoiceVisualizer::render() //--------------------------------------------------- // now, render the mofo //--------------------------------------------------- - gGL.begin( GL_TRIANGLE_STRIP ); + gGL.begin( LLVertexBuffer::TRIANGLE_STRIP ); gGL.texCoord2i( 0, 0 ); gGL.vertex3fv( bottomLeft.mV ); gGL.texCoord2i( 1, 0 ); gGL.vertex3fv( bottomRight.mV ); gGL.texCoord2i( 0, 1 ); gGL.vertex3fv( topLeft.mV ); gGL.end(); - gGL.begin( GL_TRIANGLE_STRIP ); + gGL.begin( LLVertexBuffer::TRIANGLE_STRIP ); gGL.texCoord2i( 1, 0 ); gGL.vertex3fv( bottomRight.mV ); gGL.texCoord2i( 1, 1 ); gGL.vertex3fv( topRight.mV ); gGL.texCoord2i( 0, 1 ); gGL.vertex3fv( topLeft.mV ); diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index b63543a327..af554e5160 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -185,7 +185,7 @@ const char* terse_F32_to_string( F32 f, char s[MAX_STRING] ) /* Flawfinder: ign return r; } -BOOL LLWearable::exportFile( FILE* file ) +BOOL LLWearable::exportFile( LLFILE* file ) { // header and version if( fprintf( file, "LLWearable version %d\n", mDefinitionVersion ) < 0 ) @@ -266,7 +266,7 @@ BOOL LLWearable::exportFile( FILE* file ) -BOOL LLWearable::importFile( FILE* file ) +BOOL LLWearable::importFile( LLFILE* file ) { // *NOTE: changing the type or size of this buffer will require // changes in the fscanf() code below. You would be better off @@ -852,7 +852,7 @@ void LLWearable::saveNewAsset() mAssetID.toString(new_asset_id_string); char filename[LL_MAX_PATH]; /* Flawfinder: ignore */ snprintf(filename, LL_MAX_PATH, "%s.wbl", gDirUtilp->getExpandedFilename(LL_PATH_CACHE,new_asset_id_string).c_str()); /* Flawfinder: ignore */ - FILE* fp = LLFile::fopen(filename, "wb"); /* Flawfinder: ignore */ + LLFILE* fp = LLFile::fopen(filename, "wb"); /* Flawfinder: ignore */ BOOL successful_save = FALSE; if(fp && exportFile(fp)) { diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h index 1b0fb3d7aa..fb66663fc2 100644 --- a/indra/newview/llwearable.h +++ b/indra/newview/llwearable.h @@ -78,8 +78,8 @@ public: void removeFromAvatar( BOOL set_by_user ) { LLWearable::removeFromAvatar( mType, set_by_user ); } static void removeFromAvatar( EWearableType type, BOOL set_by_user ); - BOOL exportFile(FILE* file); - BOOL importFile(FILE* file); + BOOL exportFile(LLFILE* file); + BOOL importFile(LLFILE* file); EWearableType getType() const { return mType; } void setType( EWearableType type ) { mType = type; } diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp index 29021aa54c..3ec5737acf 100644 --- a/indra/newview/llwearablelist.cpp +++ b/indra/newview/llwearablelist.cpp @@ -110,7 +110,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID if( status >= 0 ) { // read the file - FILE* fp = LLFile::fopen(filename, "rb"); /*Flawfinder: ignore*/ + LLFILE* fp = LLFile::fopen(filename, "rb"); /*Flawfinder: ignore*/ if( !fp ) { llinfos << "Bad Wearable Asset: unable to open file: '" << filename << "'" << llendl; diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 124e865637..dd1d266490 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -381,7 +381,7 @@ void LLWorldMapView::draw() glColorMask(TRUE, TRUE, TRUE, FALSE); gGL.color4f(1.f, 1.f, 1.f, layer_alpha); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.texCoord2f(0.0f, 1.0f); gGL.vertex3f(left, top, -1.0f); gGL.texCoord2f(0.0f, 0.0f); @@ -397,7 +397,7 @@ void LLWorldMapView::draw() glColorMask(FALSE, FALSE, FALSE, TRUE); gGL.color4f(1.f, 1.f, 1.f, 1.f); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.texCoord2f(0.0f, 1.0f); gGL.vertex2f(left, top); gGL.texCoord2f(0.0f, 0.0f); @@ -538,7 +538,7 @@ void LLWorldMapView::draw() F32 alpha = sim_alpha * info->mAlpha; gGL.color4f(1.f, 1.0f, 1.0f, alpha); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.texCoord2f(0.f, 1.f); gGL.vertex3f(left, top, 0.f); gGL.texCoord2f(0.f, 0.f); @@ -553,7 +553,7 @@ void LLWorldMapView::draw() { LLViewerImage::bindTexture(overlayimage); gGL.color4f(1.f, 1.f, 1.f, alpha); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.texCoord2f(0.f, 1.f); gGL.vertex3f(left, top, -0.5f); gGL.texCoord2f(0.f, 0.f); @@ -574,7 +574,7 @@ void LLWorldMapView::draw() gGL.color4f(1.f, 1.f, 1.f, 1.f); LLGLSNoTexture gls_no_texture; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.vertex2f(left, top); gGL.vertex2f(left, bottom); gGL.vertex2f(right, bottom); @@ -593,7 +593,7 @@ void LLWorldMapView::draw() gGL.color4f(0.2f, 0.0f, 0.0f, 0.4f); LLGLSNoTexture gls_no_texture; - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.vertex2f(left, top); gGL.vertex2f(left, bottom); gGL.vertex2f(right, bottom); @@ -610,7 +610,7 @@ void LLWorldMapView::draw() LLGLSNoTexture gls_no_texture; gGL.color3f(1.f, 0.f, 0.f); - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.vertex2f(left, top); gGL.vertex2f(right, bottom); gGL.vertex2f(left, bottom); @@ -971,7 +971,7 @@ void LLWorldMapView::drawFrustum() // Draw triangle with more alpha in far pixels to make it // fade out in distance. - gGL.begin( GL_TRIANGLES ); + gGL.begin( LLVertexBuffer::TRIANGLES ); gGL.color4f(1.f, 1.f, 1.f, 0.25f); gGL.vertex2f( 0, 0 ); @@ -1181,7 +1181,7 @@ static void drawDot(F32 x_pixels, F32 y_pixels, gGL.color4fv( color.mV ); LLUI::setLineWidth(1.5f); F32 h_bar = relative_z > HEIGHT_THRESHOLD ? top : bottom; // horizontal bar Y - gGL.begin( GL_LINES ); + gGL.begin( LLVertexBuffer::LINES ); gGL.vertex2f(center, top); gGL.vertex2f(left, h_bar); gGL.vertex2f(right, h_bar); diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 4f71e33af5..4972ce33ea 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -125,6 +125,7 @@ extern S32 gBoxFrame; extern BOOL gRenderLightGlows; extern BOOL gHideSelectedObjects; extern BOOL gDisplaySwapBuffers; +extern BOOL gDebugGL; // hack counter for rendering a fixed number of frames after toggling // fullscreen to work around DEV-5361 @@ -134,6 +135,7 @@ BOOL gAvatarBacklight = FALSE; BOOL gRenderForSelect = FALSE; +BOOL gDebugPipeline = FALSE; LLPipeline gPipeline; const LLMatrix4* gGLLastMatrix = NULL; @@ -2129,7 +2131,7 @@ void render_hud_elements() glStencilMask(0xFFFFFFFF); glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); - gGL.start(); + gGL.color4f(1,1,1,1); if (!LLPipeline::sReflectionRender && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI)) { gViewerWindow->renderSelections(FALSE, FALSE, FALSE); // For HUD version in render_ui_3d() @@ -2156,7 +2158,7 @@ void render_hud_elements() { LLHUDText::renderAllHUD(); } - gGL.stop(); + gGL.flush(); } void LLPipeline::renderHighlights() @@ -2260,11 +2262,9 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) LLVertexBuffer::unbind(); // Do verification of GL state -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); -#endif if (mRenderDebugMask & RENDER_DEBUG_VERIFY) { if (!verify()) @@ -2273,7 +2273,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) } } - LLVertexBuffer::startRender(); + //by bao //fake vertex buffer updating @@ -2382,19 +2382,18 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) } poolp->endRenderPass(i); LLVertexBuffer::unbind(); -#ifndef LL_RELEASE_FOR_DOWNLOAD -# if LL_DEBUG_GL - GLint depth; - glGetIntegerv(GL_MODELVIEW_STACK_DEPTH, &depth); - if (depth > 3) + if (gDebugGL || gDebugPipeline) { - llerrs << "GL matrix stack corrupted!" << llendl; + GLint depth; + glGetIntegerv(GL_MODELVIEW_STACK_DEPTH, &depth); + if (depth > 3) + { + llerrs << "GL matrix stack corrupted!" << llendl; + } + LLGLState::checkStates(); + LLGLState::checkTextureChannels(); + LLGLState::checkClientArrays(); } - LLGLState::checkStates(); - LLGLState::checkTextureChannels(); - LLGLState::checkClientArrays(); -# endif -#endif } } else @@ -2415,11 +2414,9 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) } LLVertexBuffer::unbind(); -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); -#endif gGLLastMatrix = NULL; glLoadMatrixd(gGLModelView); @@ -2434,12 +2431,10 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) stop_glerror(); -#ifndef LL_RELEASE_FOR_DOWNLOAD - LLGLState::checkStates(); - LLGLState::checkTextureChannels(); - LLGLState::checkClientArrays(); -#endif - + LLGLState::checkStates(); + LLGLState::checkTextureChannels(); + LLGLState::checkClientArrays(); + if (!sReflectionRender) { renderHighlights(); @@ -2451,17 +2446,14 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) renderDebug(); - LLVertexBuffer::stopRender(); LLVertexBuffer::unbind(); if (!LLPipeline::sReflectionRender && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI)) { - gGL.start(); // Render debugging beacons. gObjectList.renderObjectBeacons(); LLHUDObject::renderAll(); gObjectList.resetObjectBeacons(); - gGL.stop(); } //HACK: preserve/restore matrices around HUD render @@ -2474,11 +2466,9 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) } } -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); -#endif } void LLPipeline::renderGeomDeferred() @@ -2509,7 +2499,7 @@ void LLPipeline::renderDebug() assertInitialized(); - gGL.start(); + gGL.color4f(1,1,1,1); gGLLastMatrix = NULL; glLoadMatrixd(gGLModelView); @@ -2554,7 +2544,7 @@ void LLPipeline::renderDebug() if (gAgent.getRegion()) { - gGL.begin(GL_POINTS); + gGL.begin(LLVertexBuffer::POINTS); // Draw the composition layer for the region that I'm in. for (x = 0; x <= 260; x++) { @@ -2577,7 +2567,7 @@ void LLPipeline::renderDebug() gGL.end(); } } - gGL.stop(); + gGL.flush(); } void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects) @@ -2594,7 +2584,7 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects) LLMemType mt(LLMemType::MTYPE_PIPELINE); - LLVertexBuffer::startRender(); + glMatrixMode(GL_MODELVIEW); @@ -2603,13 +2593,14 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects) LLGLDepthTest gls_depth(GL_TRUE,GL_TRUE); disableLights(); + LLVertexBuffer::unbind(); + //for each drawpool -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); U32 last_type = 0; -#endif + for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter) { LLDrawPool *poolp = *iter; @@ -2621,7 +2612,6 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects) gGLLastMatrix = NULL; glLoadMatrixd(gGLModelView); -#ifndef LL_RELEASE_FOR_DOWNLOAD if (poolp->getType() != last_type) { last_type = poolp->getType(); @@ -2629,7 +2619,6 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects) LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); } -#endif } } @@ -2758,7 +2747,6 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects) glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); LLVertexBuffer::unbind(); - LLVertexBuffer::stopRender(); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); } @@ -4115,11 +4103,9 @@ void apply_cube_face_rotation(U32 face) } void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam) { -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); -#endif assertInitialized(); @@ -4251,12 +4237,9 @@ void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam) LLPipeline::sSkipUpdate = FALSE; LLPipeline::sReflectionRender = FALSE; -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); -#endif - } //send cube map vertices and texture coordinates @@ -4333,11 +4316,9 @@ void validate_framebuffer_object() void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out) { -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); -#endif assertInitialized(); @@ -4448,11 +4429,9 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out) gViewerWindow->setupViewport(); gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); -#endif } void LLPipeline::bindScreenToTexture() @@ -4468,10 +4447,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot) return; } -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); -#endif assertInitialized(); @@ -4494,7 +4471,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot) glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); LLFastTimer ftm(LLFastTimer::FTM_RENDER_BLOOM); - gGL.start(); + gGL.color4f(1,1,1,1); LLGLDepthTest depth(GL_FALSE); LLGLDisable blend(GL_BLEND); LLGLDisable cull(GL_CULL_FACE); @@ -4524,7 +4501,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot) LLGLEnable blend(GL_BLEND); gGL.blendFunc(GL_ONE, GL_ONE); tc2.setVec(1,1); - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); gGL.color4f(1,1,1,1); gGL.texCoord2f(tc1.mV[0], tc1.mV[1]); gGL.vertex2f(-1,-1); @@ -4543,7 +4520,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot) gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } - gGL.stop(); + gGL.flush(); glMatrixMode(GL_PROJECTION); glPopMatrix(); glMatrixMode(GL_MODELVIEW); @@ -4582,7 +4559,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot) gGL.color4f(1,1,1,1); gPipeline.enableLightsFullbright(LLColor4(1,1,1,1)); - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); gGL.texCoord2f(tc1.mV[0], tc1.mV[1]); gGL.vertex2f(-1,-1); @@ -4652,7 +4629,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot) gGlowProgram.uniform2f("glowDelta", 0, delta); } - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); gGL.texCoord2f(tc1.mV[0], tc1.mV[1]); gGL.vertex2f(-1,-1); @@ -4686,7 +4663,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot) glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); LLGLDisable blend(GL_BLEND); - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); gGL.color4f(1,1,1,1); gGL.texCoord2f(tc1.mV[0], tc1.mV[1]); gGL.vertex2f(-1,-1); @@ -4721,7 +4698,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot) glEnable(GL_TEXTURE_RECTANGLE_ARB); mScreen.bindTexture(); - gGL.begin(GL_TRIANGLE_STRIP); + gGL.begin(LLVertexBuffer::TRIANGLE_STRIP); gGL.color4f(1,1,1,1); gGL.texCoord2f(tc1.mV[0], tc1.mV[1]); gGL.vertex2f(-1,-1); @@ -4743,7 +4720,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot) gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); }*/ - gGL.stop(); + gGL.flush(); { LLVertexBuffer::unbind(); @@ -4829,10 +4806,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot) glMatrixMode(GL_MODELVIEW); glPopMatrix(); -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); -#endif } @@ -4864,11 +4839,9 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) { LLVertexBuffer::unbind(); -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); -#endif LLCamera camera = camera_in; camera.setFar(camera.getFar()*0.87654321f); @@ -5057,11 +5030,9 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) LLViewerCamera::getInstance()->setUserClipPlane(LLPlane(-pnorm, -pd)); LLPipeline::sUseOcclusion = occlusion; -#ifndef LL_RELEASE_FOR_DOWNLOAD LLGLState::checkStates(); LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); -#endif } } @@ -5259,15 +5230,15 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar) LLGLDepthTest depth(GL_FALSE, GL_FALSE); - gGL.start(); + gGL.color4f(1,1,1,1); gGL.color4ub(64,64,64,1); - gGL.begin(GL_QUADS); + gGL.begin(LLVertexBuffer::QUADS); gGL.vertex3fv((pos+left-up).mV); gGL.vertex3fv((pos-left-up).mV); gGL.vertex3fv((pos-left+up).mV); gGL.vertex3fv((pos+left+up).mV); gGL.end(); - gGL.stop(); + gGL.flush(); gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 7e38628d87..a96fe0865d 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -550,6 +550,7 @@ void render_bbox(const LLVector3 &min, const LLVector3 &max); extern LLPipeline gPipeline; extern BOOL gRenderForSelect; +extern BOOL gDebugPipeline; extern const LLMatrix4* gGLLastMatrix; #endif diff --git a/indra/test/llblowfish_tut.cpp b/indra/test/llblowfish_tut.cpp index b220755941..3859d6c3b1 100644 --- a/indra/test/llblowfish_tut.cpp +++ b/indra/test/llblowfish_tut.cpp @@ -60,13 +60,13 @@ namespace tut bool matchFile(const char* filename, const std::string& data) { - FILE* fp = fopen(filename, "rb"); + LLFILE* fp = LLFile::fopen(filename, "rb"); if (!fp) { // sometimes test is run inside the indra directory std::string path = "test/"; path += filename; - fp = fopen(path.c_str(), "rb"); + fp = LLFile::fopen(path.c_str(), "rb"); } if (!fp) { diff --git a/indra/test/lldatapacker_tut.cpp b/indra/test/lldatapacker_tut.cpp index a010ed0f4e..2b2085e0ae 100644 --- a/indra/test/lldatapacker_tut.cpp +++ b/indra/test/lldatapacker_tut.cpp @@ -351,7 +351,7 @@ namespace tut { F32 f_val = 44.44f, f_unpkval; - FILE* fp = fopen(TEST_FILE_NAME, "w+"); + LLFILE* fp = LLFile::fopen(TEST_FILE_NAME, "w+"); if(!fp) { llerrs << "File couldnt be open" <<llendl; @@ -406,7 +406,7 @@ namespace tut LLVector4 unpkllvec4; LLUUID unpkuuid; - FILE* fp = fopen(TEST_FILE_NAME,"w+"); + LLFILE* fp = LLFile::fopen(TEST_FILE_NAME,"w+"); if(!fp) { llerrs << "File couldnt be open" <<llendl; diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp index 8d5223e2bc..69f832049c 100644 --- a/indra/test/llpermissions_tut.cpp +++ b/indra/test/llpermissions_tut.cpp @@ -421,7 +421,7 @@ namespace tut template<> template<> void permission_object_t::test<20>() { - FILE* fp = fopen("linden_file.dat","w+"); + LLFILE* fp = LLFile::fopen("linden_file.dat","w+"); if(!fp) { llerrs << "file coudnt be opened\n" << llendl; @@ -444,7 +444,7 @@ namespace tut perm.exportFile(fp); fclose(fp); - fp = fopen("linden_file.dat","r+"); + fp = LLFile::fopen("linden_file.dat","r+"); if(!fp) { llerrs << "file coudnt be opened\n" << llendl; diff --git a/indra/test/llsaleinfo_tut.cpp b/indra/test/llsaleinfo_tut.cpp index 96da93a6ce..0d0c52a2dd 100644 --- a/indra/test/llsaleinfo_tut.cpp +++ b/indra/test/llsaleinfo_tut.cpp @@ -113,7 +113,7 @@ namespace tut void llsaleinfo_test_t::test<2>() { - FILE* fp = fopen("linden_file.dat","w+"); + LLFILE* fp = LLFile::fopen("linden_file.dat","w+"); if(!fp) { llerrs << "file could not be opened\n" << llendl; @@ -129,7 +129,7 @@ namespace tut LLSaleInfo llsaleinfo1; U32 perm_mask; BOOL has_perm_mask; - fp = fopen("linden_file.dat","r"); + fp = LLFile::fopen("linden_file.dat","r"); if(!fp) { |