Force-enable assert on release mode Windows build (#440)

common/goos/Object.h

@@ -41,7 +41,7 @@
  */
 
 #include <string>
-#include <cassert>
+#include "common/util/assert.h"
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>

common/goos/PrettyPrinter.cpp

@@ -4,7 +4,7 @@
  * It is not very good, but significantly better than putting everything on one line
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <stdexcept>
 #include <utility>
 #include <cstring>

common/goos/Reader.h

@@ -12,7 +12,7 @@
  */
 
 #include <memory>
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 #include <unordered_map>
 #include <optional>

common/log/log.cpp

@@ -1,6 +1,6 @@
 #include <cstdio>
 #include <cstdlib>
-#include <cassert>
+#include "common/util/assert.h"
 #include <mutex>
 #include "third-party/fmt/color.h"
 #include "log.h"

common/type_system/Type.cpp

@@ -4,7 +4,7 @@
  */
 
 #include <stdexcept>
-#include <cassert>
+#include "common/util/assert.h"
 #include <third-party/fmt/core.h>
 #include "Type.h"
 
@@ -707,4 +707,4 @@ bool EnumType::operator==(const Type& other) const {
   auto* p_other = dynamic_cast<const EnumType*>(&other);
   return other.is_equal(*this) && (m_entries == p_other->m_entries) &&
          (m_is_bitfield == p_other->m_is_bitfield);
-}
+}

common/type_system/Type.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <string>
-#include <cassert>
+#include "common/util/assert.h"
 #include <unordered_map>
 #include "common/goal_constants.h"
 #include "TypeSpec.h"

common/type_system/TypeSpec.h

@@ -10,7 +10,7 @@
 
 #include <vector>
 #include <string>
-#include <cassert>
+#include "common/util/assert.h"
 
 class Type;
 

common/type_system/TypeSystem.cpp

@@ -5,7 +5,7 @@
  * access types, and reverse type lookups.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <stdexcept>
 #include <third-party/fmt/core.h>
 #include "TypeSystem.h"

common/util/BinaryReader.h

@@ -6,7 +6,7 @@
  */
 
 #include <cstdint>
-#include <cassert>
+#include "common/util/assert.h"
 #include <vector>
 
 class BinaryReader {

common/util/BinaryWriter.h

@@ -5,7 +5,7 @@
  * Write raw data like a stream.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <stdexcept>
 #include <vector>
 #include <cstdint>

common/util/FileUtil.cpp

@@ -9,7 +9,7 @@
 #include <cstdio> /* defines FILENAME_MAX */
 #include <fstream>
 #include <sstream>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdlib>
 #include "common/util/BinaryReader.h"
 #include "BinaryWriter.h"

common/util/Timer.h

@@ -3,7 +3,7 @@
 #ifndef JAK_V2_TIMER_H
 #define JAK_V2_TIMER_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdint>
 #include <ctime>
 

common/util/Trie.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <vector>
 #include <string>
 

common/util/assert.h

@@ -0,0 +1,22 @@
+#pragma once
+
+/*!
+ * @file assert.h
+ * Wrapper around <cassert>.
+ */
+
+#if defined NDEBUG && defined _WIN32
+
+#define _OLD_NDEBUG NDEBUG
+
+#undef NDEBUG
+#include <cassert>
+#define NDEBUG _OLD_NDEBUG
+
+#undef _OLD_NDEBUG
+
+#else
+
+#include <cassert>
+
+#endif

common/util/dgo_util.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "dgo_util.h"
 #include "common/versions.h"

common/util/json_util.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include "json_util.h"
 
 /*!

decompiler/Disasm/Instruction.cpp

@@ -7,7 +7,7 @@
 #include "Instruction.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 #include "third-party/fmt/core.h"
-#include <cassert>
+#include "common/util/assert.h"
 
 namespace decompiler {
 /*!

decompiler/Disasm/InstructionDecode.cpp

@@ -5,7 +5,7 @@
  */
 
 #include "InstructionDecode.h"
-#include <cassert>
+#include "common/util/assert.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 
 namespace decompiler {

decompiler/Disasm/InstructionMatching.cpp

@@ -3,7 +3,7 @@
  * Utilities for checking if an instruction matches some criteria.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "InstructionMatching.h"
 
 namespace decompiler {

decompiler/Disasm/InstructionParser.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <algorithm>
 #include <stdexcept>
 #include "common/common_types.h"

decompiler/Disasm/OpcodeInfo.cpp

@@ -4,7 +4,7 @@
  */
 
 #include "OpcodeInfo.h"
-#include <cassert>
+#include "common/util/assert.h"
 
 namespace decompiler {
 OpcodeInfo gOpcodeInfo[(uint32_t)InstructionKind::EE_OP_MAX];
@@ -518,4 +518,4 @@ OpcodeInfo& OpcodeInfo::dst_vf(FieldType field) {
 OpcodeInfo& OpcodeInfo::dst_vi(FieldType field) {
   return dst(field, DT::VI);
 }
-}  // namespace decompiler
+}  // namespace decompiler

decompiler/Disasm/Register.cpp

@@ -4,7 +4,7 @@
  */
 
 #include "Register.h"
-#include <cassert>
+#include "common/util/assert.h"
 #include <stdexcept>
 
 namespace decompiler {

decompiler/Disasm/Register.h

@@ -6,7 +6,7 @@
  */
 
 #include <cstdint>
-#include <cassert>
+#include "common/util/assert.h"
 #include <string>
 
 namespace decompiler {

decompiler/Function/BasicBlocks.cpp

@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <cassert>
+#include "common/util/assert.h"
 #include "BasicBlocks.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
 #include "decompiler/Disasm/InstructionMatching.h"
@@ -68,4 +68,4 @@ std::vector<BasicBlock> find_blocks_in_function(const LinkedObjectFile& file,
 
   return basic_blocks;
 }
-}  // namespace decompiler
+}  // namespace decompiler

decompiler/Function/CfgVtx.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/goos/PrettyPrinter.h"
 #include "decompiler/Disasm/InstructionMatching.h"
 #include "decompiler/ObjectFile/LinkedObjectFile.h"
@@ -2091,4 +2091,4 @@ std::shared_ptr<ControlFlowGraph> build_cfg(const LinkedObjectFile& file, int se
 
   return cfg;
 }
-}  // namespace decompiler
+}  // namespace decompiler

decompiler/Function/CfgVtx.h

@@ -5,7 +5,7 @@
 
 #include <string>
 #include <vector>
-#include <cassert>
+#include "common/util/assert.h"
 
 namespace goos {
 class Object;

decompiler/Function/Function.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <vector>
 #include "Function.h"
 #include "common/log/log.h"

decompiler/Function/Warnings.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <string>
 #include <vector>
-#include <cassert>
+#include "common/util/assert.h"
 
 #include "third-party/fmt/core.h"
 

decompiler/IR/IR.h

@@ -1,7 +1,7 @@
 #ifndef JAK_IR_H
 #define JAK_IR_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 #include <memory>
 #include <unordered_map>

decompiler/IR2/AtomicOp.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 #include <stdexcept>
 #include "common/goal_constants.h"

decompiler/IR2/AtomicOp.h

@@ -2,7 +2,7 @@
 
 #include <string>
 #include <optional>
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 #include "common/goos/Object.h"
 #include "decompiler/Disasm/Register.h"

decompiler/IR2/Env.h

@@ -2,7 +2,7 @@
 
 #include <string>
 #include <vector>
-#include <cassert>
+#include "common/util/assert.h"
 #include <common/goos/Object.h>
 #include "decompiler/util/TP_Type.h"
 #include "decompiler/util/StackSpillMap.h"

decompiler/IR2/OpenGoalMapping.h

@@ -2,7 +2,7 @@
 
 #include <string>
 #include <optional>
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 #include <map>
 #include "common/goos/Object.h"

decompiler/IR2/bitfields.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cassert>
+#include "common/util/assert.h"
 
 #include "common/common_types.h"
 #include "decompiler/IR2/Form.h"

decompiler/ObjectFile/LinkedObjectFile.cpp

@@ -4,7 +4,7 @@
  */
 
 #include <algorithm>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include <numeric>
 #include "decompiler/IR/IR.h"

decompiler/ObjectFile/LinkedObjectFileCreation.cpp

@@ -4,7 +4,7 @@
  * This implements a decoder for the GOAL linking format.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "LinkedObjectFileCreation.h"
 #include "decompiler/config.h"

decompiler/ObjectFile/LinkedWord.h

@@ -7,7 +7,7 @@
 
 #include <cstdint>
 #include <string>
-#include <cassert>
+#include "common/util/assert.h"
 
 #include "common/common_types.h"
 

decompiler/ObjectFile/ObjectFileDB.h

@@ -10,7 +10,7 @@
 #ifndef JAK2_DISASSEMBLER_OBJECTFILEDB_H
 #define JAK2_DISASSEMBLER_OBJECTFILEDB_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <string>
 #include <unordered_map>
 #include <vector>

decompiler/analysis/variable_naming.h

@@ -19,7 +19,7 @@
 #include <vector>
 #include <optional>
 #include <unordered_map>
-#include <cassert>
+#include "common/util/assert.h"
 #include "decompiler/Disasm/Register.h"
 #include "decompiler/util/TP_Type.h"
 #include "decompiler/IR2/IR2_common.h"

decompiler/data/LinkedWordReader.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include <vector>
 #include <string>

decompiler/data/StrFileReader.cpp

@@ -3,7 +3,7 @@
  * Utility class to read a .STR file and extract the full file name.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "common/util/FileUtil.h"
 #include "game/common/overlord_common.h"

decompiler/util/DataParser.cpp

@@ -1,5 +1,5 @@
 #include <stdexcept>
-#include <cassert>
+#include "common/util/assert.h"
 #include "DataParser.h"
 #include "third-party/fmt/core.h"
 

decompiler/util/TP_Type.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <string>
-#include <cassert>
+#include "common/util/assert.h"
 #include <stdexcept>
 #include "common/log/log.h"
 #include "common/type_system/TypeSpec.h"
@@ -319,4 +319,4 @@ struct TypeState {
 };
 
 u32 regs_to_gpr_mask(const std::vector<Register>& regs);
-}  // namespace decompiler
+}  // namespace decompiler

game/kernel/Ptr.h

@@ -8,7 +8,7 @@
 #ifndef JAK_PTR_H
 #define JAK_PTR_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "game/runtime.h"
 #include "common/common_types.h"
 

game/kernel/fileio.cpp

@@ -4,7 +4,7 @@
  * DONE!
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include <cstdio>
 #include "game/sce/sif_ee.h"

game/kernel/kdsnetm.cpp

@@ -6,7 +6,7 @@
 
 #include <cstring>
 #include <cstdio>
-#include <cassert>
+#include "common/util/assert.h"
 #include "game/sce/deci2.h"
 #include "game/system/deci_common.h"  // todo, reorganize to avoid this include
 #include "kdsnetm.h"

game/kernel/klink.cpp

@@ -7,7 +7,7 @@
  */
 
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdio>
 #include <common/versions.h>
 #include "klink.h"

game/kernel/kmachine.cpp

@@ -7,7 +7,7 @@
 
 #include <string>
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include "kmachine.h"
 #include "kboot.h"
 #include "kprint.h"

game/kernel/kprint.cpp

@@ -7,7 +7,7 @@
 #include <cmath>
 #include <cstdarg>
 #include <cstdio>
-#include <cassert>
+#include "common/util/assert.h"
 
 #include "common/goal_constants.h"
 #include "common/common_types.h"

game/kernel/kscheme.cpp

@@ -4,7 +4,7 @@
  */
 
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include "kscheme.h"
 #include "common/common_types.h"
 #include "common/goal_constants.h"

game/overlord/fake_iso.cpp

@@ -10,7 +10,7 @@
  */
 
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include "fake_iso.h"
 #include "game/sce/iop.h"
 #include "isocommon.h"

game/overlord/iso_queue.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
 #include <cstdio>
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/log/log.h"
 #include "game/sce/iop.h"
 #include "iso_queue.h"

game/overlord/ramdisk.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdio>
 #include "common/common_types.h"
 #include "game/common/ramdisk_rpc_types.h"

game/overlord/stream.cpp

@@ -4,7 +4,7 @@
  * Supports loading a file directly to the EE, or loading chunks of a chunked file.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "stream.h"
 #include "game/sce/iop.h"

game/sce/deci2.cpp

@@ -3,7 +3,7 @@
  * Implementation of SCE DECI2 library.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdio>
 #include <cstring>
 #include "common/log/log.h"

game/sce/iop.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "iop.h"
 #include "game/system/iop_thread.h"

game/sce/libcdvd_ee.cpp

@@ -3,7 +3,7 @@
  * Stub implementation of the EE CD/DVD library
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "libcdvd_ee.h"
 
 namespace ee {

game/sce/libpad.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include "libpad.h"
 
 namespace ee {

game/sce/sif_ee.cpp

@@ -1,5 +1,5 @@
 #include <cstring>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstdio>
 #include <unordered_map>
 #include "common/util/FileUtil.h"

game/sce/stubs.cpp

@@ -1,5 +1,5 @@
 #include <stdexcept>
-#include <cassert>
+#include "common/util/assert.h"
 #include "stubs.h"
 
 namespace ee {

game/system/Deci2Server.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <cstdio>
-#include <cassert>
+#include "common/util/assert.h"
 #include <utility>
 
 // TODO - i think im not including the dependency right..?

game/system/IOP_Kernel.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include "IOP_Kernel.h"
 #include "game/sce/iop.h"

game/system/IOP_Kernel.h

@@ -10,7 +10,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <atomic>
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/common_types.h"
 
 class IOP_Kernel;

goalc/compiler/SymbolInfo.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <vector>
 #include <string>
 #include <set>

goalc/data_compiler/DataObjectGenerator.cpp

@@ -1,6 +1,6 @@
 #include <cstring>
 #include <algorithm>
-#include <cassert>
+#include "common/util/assert.h"
 #include "DataObjectGenerator.h"
 #include "common/link_types.h"
 

goalc/debugger/DebugInfo.h

@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/common_types.h"
 #include "goalc/emitter/Instruction.h"
 #include "goalc/debugger/disassemble.h"

goalc/debugger/Debugger.cpp

@@ -4,7 +4,7 @@
  * Uses xdbg functions to debug an OpenGOAL target.
  */
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "Debugger.h"
 #include "common/util/Timer.h"
 #include "common/goal_constants.h"

goalc/emitter/IGen.h

@@ -3,7 +3,7 @@
 #ifndef JAK_IGEN_H
 #define JAK_IGEN_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "Register.h"
 #include "Instruction.h"
 #include <stdexcept>

goalc/emitter/Instruction.h

@@ -3,7 +3,7 @@
 #ifndef JAK_INSTRUCTION_H
 #define JAK_INSTRUCTION_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/common_types.h"
 
 namespace emitter {

goalc/emitter/Register.h

@@ -8,7 +8,7 @@
 #ifndef JAK_REGISTER_H
 #define JAK_REGISTER_H
 
-#include <cassert>
+#include "common/util/assert.h"
 #include <array>
 #include <vector>
 #include <string>

goalc/listener/Listener.cpp

@@ -21,7 +21,7 @@
 #include "common/cross_sockets/xsocket.h"
 
 #include <stdexcept>
-#include <cassert>
+#include "common/util/assert.h"
 #include <cstring>
 #include <chrono>
 #include <thread>

goalc/listener/MemoryMap.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include <algorithm>
 #include <stdexcept>
 #include "MemoryMap.h"

goalc/regalloc/IRegSet.h

@@ -14,7 +14,7 @@
  * The space used is (highest_set_reg + 63) / 64 + constant overhead (vector + int)
  */
 #include <vector>
-#include <cassert>
+#include "common/util/assert.h"
 #include "common/common_types.h"
 
 class IRegSet {

goalc/regalloc/IRegister.cpp

@@ -1,4 +1,4 @@
-#include <cassert>
+#include "common/util/assert.h"
 #include "third-party/fmt/core.h"
 #include "IRegister.h"