summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/hir/deserialise.cpp2
-rw-r--r--src/trans/codegen_c.cpp7
-rw-r--r--vsproject/mrustc.vcxproj10
3 files changed, 16 insertions, 3 deletions
diff --git a/src/hir/deserialise.cpp b/src/hir/deserialise.cpp
index b93f207f..5870d269 100644
--- a/src/hir/deserialise.cpp
+++ b/src/hir/deserialise.cpp
@@ -52,7 +52,7 @@ namespace {
template<typename V>
::std::unordered_map< ::std::string,V> deserialise_strumap()
{
- TRACE_FUNCTION_F("<" << typeid(typename V).name() << ">");
+ TRACE_FUNCTION_F("<" << typeid(V).name() << ">");
size_t n = m_in.read_count();
::std::unordered_map< ::std::string, V> rv;
//rv.reserve(n);
diff --git a/src/trans/codegen_c.cpp b/src/trans/codegen_c.cpp
index 40bbddbb..520371f5 100644
--- a/src/trans/codegen_c.cpp
+++ b/src/trans/codegen_c.cpp
@@ -2089,6 +2089,13 @@ namespace {
m_of << "s";
m_of << "("; emit_param(ve.val_r); m_of << ", "; emit_param(ve.val_l); m_of << ")";
break;
+
+ case ::MIR::eBinOp::ADD_OV:
+ case ::MIR::eBinOp::SUB_OV:
+ case ::MIR::eBinOp::MUL_OV:
+ case ::MIR::eBinOp::DIV_OV:
+ MIR_TODO(mir_res, "Overflowing binops for emulated i128");
+ break;
}
break;
}
diff --git a/vsproject/mrustc.vcxproj b/vsproject/mrustc.vcxproj
index 8afae708..c890484e 100644
--- a/vsproject/mrustc.vcxproj
+++ b/vsproject/mrustc.vcxproj
@@ -77,13 +77,14 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../src/include;../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
+ <WarningLevel>Level1</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<PreprocessToFile>false</PreprocessToFile>
<AssemblerListingLocation>$(IntDir)dummy\%(RelativeDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)dummy\%(RelativeDir)</ObjectFileName>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+ <TreatSpecificWarningsAsErrors>4062;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
@@ -96,12 +97,13 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../src/include;../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
+ <WarningLevel>Level1</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PreprocessToFile>false</PreprocessToFile>
<AssemblerListingLocation>$(IntDir)dummy\%(RelativeDir)</AssemblerListingLocation>
<ObjectFileName>$(IntDir)dummy\%(RelativeDir)</ObjectFileName>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+ <TreatSpecificWarningsAsErrors>4062;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
@@ -121,6 +123,8 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>Disabled</Optimization>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+ <WarningLevel>Level1</WarningLevel>
+ <TreatSpecificWarningsAsErrors>4062;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -131,6 +135,8 @@
<ObjectFileName>$(IntDir)dummy\%(RelativeDir)</ObjectFileName>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+ <WarningLevel>Level1</WarningLevel>
+ <TreatSpecificWarningsAsErrors>4062;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<FullProgramDatabaseFile>true</FullProgramDatabaseFile>