Skip to content

Commit 0b7988c

Browse files
authored
Fix few gcc build warnings for RISC-V (dotnet#102426)
1 parent 5474ab5 commit 0b7988c

File tree

5 files changed

+12
-10
lines changed

5 files changed

+12
-10
lines changed

src/coreclr/debug/ee/controller.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6058,6 +6058,8 @@ bool DebuggerStepper::TrapStep(ControllerStackInfo *info, bool in)
60586058
}
60596059
}
60606060
LOG((LF_CORDB,LL_INFO1000,"Ending TrapStep\n"));
6061+
6062+
return false;
60616063
}
60626064

60636065
bool DebuggerStepper::IsAddrWithinFrame(DebuggerJitInfo *dji,

src/coreclr/jit/codegenriscv64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1943,7 +1943,7 @@ void CodeGen::genLclHeap(GenTree* tree)
19431943
noway_assert(isFramePointerUsed()); // localloc requires Frame Pointer to be established since SP changes
19441944
noway_assert(genStackLevel == 0); // Can't have anything on the stack
19451945

1946-
const target_ssize_t pageSize = compiler->eeGetPageSize();
1946+
const target_size_t pageSize = compiler->eeGetPageSize();
19471947

19481948
// According to RISC-V Privileged ISA page size is 4KiB
19491949
noway_assert(pageSize == 0x1000);

src/coreclr/vm/riscv64/asmhelpers.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ NESTED_ENTRY ThePreStub, _TEXT, NoHandler
382382
EPILOG_BRANCH_REG t4
383383
NESTED_END ThePreStub, _TEXT
384384

385-
// ------------------------------------------------------------------\
385+
// ------------------------------------------------------------------
386386

387387
// EXTERN_C int __fastcall HelperMethodFrameRestoreState(
388388
// INDEBUG_COMMA(HelperMethodFrame *pFrame)

src/coreclr/vm/riscv64/profiler.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ LPVOID ProfileArgIterator::CopyStructFromRegisters(const ArgLocDesc* sir)
112112
PROFILE_PLATFORM_SPECIFIC_DATA* pData = reinterpret_cast<PROFILE_PLATFORM_SPECIFIC_DATA*>(m_handle);
113113

114114
struct { bool isFloat, is8; } fields[] = {
115-
{ sir->m_structFields & (STRUCT_FLOAT_FIELD_FIRST | STRUCT_FLOAT_FIELD_ONLY_TWO | STRUCT_FLOAT_FIELD_ONLY_ONE),
116-
sir->m_structFields & STRUCT_FIRST_FIELD_SIZE_IS8 },
117-
{ sir->m_structFields & (STRUCT_FLOAT_FIELD_SECOND | STRUCT_FLOAT_FIELD_ONLY_TWO),
118-
sir->m_structFields & STRUCT_SECOND_FIELD_SIZE_IS8 },
115+
{ (bool) (sir->m_structFields & (STRUCT_FLOAT_FIELD_FIRST | STRUCT_FLOAT_FIELD_ONLY_TWO | STRUCT_FLOAT_FIELD_ONLY_ONE)),
116+
(bool) (sir->m_structFields & STRUCT_FIRST_FIELD_SIZE_IS8) },
117+
{ (bool) (sir->m_structFields & (STRUCT_FLOAT_FIELD_SECOND | STRUCT_FLOAT_FIELD_ONLY_TWO)),
118+
(bool) (sir->m_structFields & STRUCT_SECOND_FIELD_SIZE_IS8) },
119119
};
120120
int fieldCount = (sir->m_structFields & STRUCT_FLOAT_FIELD_ONLY_ONE) ? 1 : 2;
121121
UINT64 bufferPosBegin = m_bufferPos;
@@ -191,11 +191,11 @@ LPVOID ProfileArgIterator::GetNextArgAddr()
191191
}
192192
}
193193

194-
int argSize = m_argIterator.IsArgPassedByRef() ? sizeof(void*) : m_argIterator.GetArgSize();
194+
int argSize = m_argIterator.IsArgPassedByRef() ? (int)sizeof(void*) : m_argIterator.GetArgSize();
195195
if (TransitionBlock::IsFloatArgumentRegisterOffset(argOffset))
196196
{
197197
int offset = argOffset - TransitionBlock::GetOffsetOfFloatArgumentRegisters();
198-
_ASSERTE(offset + argSize <= sizeof(pData->floatArgumentRegisters));
198+
_ASSERTE(offset + argSize <= (int)sizeof(pData->floatArgumentRegisters));
199199
return (LPBYTE)&pData->floatArgumentRegisters + offset;
200200
}
201201

@@ -204,7 +204,7 @@ LPVOID ProfileArgIterator::GetNextArgAddr()
204204
if (TransitionBlock::IsArgumentRegisterOffset(argOffset))
205205
{
206206
int offset = argOffset - TransitionBlock::GetOffsetOfArgumentRegisters();
207-
if (offset + argSize > sizeof(pData->argumentRegisters))
207+
if (offset + argSize > (int)sizeof(pData->argumentRegisters))
208208
{
209209
// Struct partially spilled on stack
210210
const int regIndex = NUM_ARGUMENT_REGISTERS - 1; // first part of struct must be in last register

src/coreclr/vm/riscv64/stubs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ void StubLinkerCPU::EmitMovConstant(IntReg reg, UINT64 imm)
10701070
if (high31 & 0x800)
10711071
{
10721072
// EmitAddImm does not allow negative immediate values, so use EmitSubImm.
1073-
EmitSubImm(reg, reg, ~high31 + 1 & 0xFFF);
1073+
EmitSubImm(reg, reg, (~high31 + 1) & 0xFFF);
10741074
}
10751075
else
10761076
{

0 commit comments

Comments
 (0)