nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-02 16:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

hashx: Fix a few more compiler warnings

Browse Source 
Fix a couple cases where size_t values were being confused with int.

Signed-off-by: Micah Elizabeth Scott <beth@torproject.org>
This commit is contained in:
Micah Elizabeth Scott 2023-08-07 16:19:41 -07:00
parent 3d63d713ea
commit ef08c00df2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ext/equix/hashx/src/compiler_a64.c
View File

@ -55,7 +55,7 @@ bool hashx_compile_a64(const hashx_program* program, uint8_t* code) {
uint8_t* target = NULL; uint8_t* target = NULL;
int creg = -1; int creg = -1;
EMIT(pos, a64_prologue); EMIT(pos, a64_prologue);
for (int i = 0; i < program->code_size; ++i) { for (size_t i = 0; i < program->code_size; ++i) {
const instruction* instr = &program->code[i]; const instruction* instr = &program->code[i];
switch (instr->opcode) switch (instr->opcode)
{ {

10
src/ext/equix/hashx/src/program.c
View File

@ -678,7 +678,7 @@ bool hashx_program_generate(const siphash_state* key, hashx_program* program) {
/* Calculate ASIC latency: /* Calculate ASIC latency:
Assumes 1 cycle latency for all operations and unlimited parallelization. */ Assumes 1 cycle latency for all operations and unlimited parallelization. */
for (int i = 0; i < program->code_size; ++i) { for (size_t i = 0; i < program->code_size; ++i) {
instruction* instr = &program->code[i]; instruction* instr = &program->code[i];
if (instr->dst < 0) if (instr->dst < 0)
continue; continue;
@ -724,8 +724,8 @@ bool hashx_program_generate(const siphash_state* key, hashx_program* program) {
static const char* x86_reg_map[] = { "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" }; static const char* x86_reg_map[] = { "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" };
void hashx_program_asm_x86(const hashx_program* program) { void hashx_program_asm_x86(const hashx_program* program) {
int target = 0; size_t target = 0;
for (unsigned i = 0; i < program->code_size; ++i) { for (size_t i = 0; i < program->code_size; ++i) {
const instruction* instr = &program->code[i]; const instruction* instr = &program->code[i];
switch (instr->opcode) switch (instr->opcode)
{ {
@ -762,13 +762,13 @@ void hashx_program_asm_x86(const hashx_program* program) {
break; break;
case INSTR_TARGET: case INSTR_TARGET:
printf("test edi, edi\n"); printf("test edi, edi\n");
printf("target_%i: cmovz esi, edi\n", i); printf("target_%i: cmovz esi, edi\n", (int)i);
target = i; target = i;
break; break;
case INSTR_BRANCH: case INSTR_BRANCH:
printf("or edx, esi\n"); printf("or edx, esi\n");
printf("test edx, %i\n", instr->imm32); printf("test edx, %i\n", instr->imm32);
printf("jz target_%i\n", target); printf("jz target_%i\n", (int)target);
break; break;
default: default:
UNREACHABLE; UNREACHABLE;