Skip to content

Commit 70d0ac3

Browse files
committed
Fixed some warnings
1 parent e12c695 commit 70d0ac3

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

VirtualGameBox/AVR.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ unsigned int AVR::tick() {
329329
decode3d3r(opcode, Rd, Rr);
330330
int16_t vRd = static_cast<int8_t>(rbank.get(Rd));
331331
int16_t vRr = static_cast<int8_t>(rbank.get(Rr));
332-
uint16_t res = (vRd * vRr) << 1;
332+
uint16_t res = (uint16_t)(vRd * vRr) << 1;
333333
rbank.set(AVRRegister::R0, res & 0xff);
334334
rbank.set(AVRRegister::R1, res >> 8);
335335
rbank.setSREG(SREG_C, (res >> 15) & 1);
@@ -346,7 +346,7 @@ unsigned int AVR::tick() {
346346
decode3d3r(opcode, Rd, Rr);
347347
int16_t vRd = static_cast<int8_t>(rbank.get(Rd));
348348
uint16_t vRr = rbank.get(Rr);
349-
uint16_t res = (vRd * vRr) << 1;
349+
uint16_t res = (uint16_t)(vRd * vRr) << 1;
350350
rbank.set(AVRRegister::R0, res & 0xff);
351351
rbank.set(AVRRegister::R1, res >> 8);
352352
rbank.setSREG(SREG_C, (res >> 15) & 1);

VirtualGameBox/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ target_link_libraries(VirtualGameBox Threads::Threads)
3535
target_link_libraries(VirtualGameBox Qt5::Widgets)
3636

3737
set(CMAKE_CXX_FLAGS "-Wall -Wextra")
38-
set(CMAKE_CXX_FLAGS_DEBUG "-g")
38+
set(CMAKE_CXX_FLAGS_DEBUG "-g3 -O0 -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
3939
set(CMAKE_CXX_FLAGS_RELEASE "-O3")

VirtualGameBox/Window.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ Window::Window(std::vector<uint8_t> &buf)
5454
connect(timer, SIGNAL(timeout()), this, SLOT(updateScreen()));
5555
timer->start(1000 / 30);
5656

57+
avr.flash.fill(0x00);
58+
5759
for (size_t i = 0; i < buf.size(); i += 2) {
5860
avr.flash[i >> 1] =
5961
(((uint8_t)buf[i + 1]) << 8) | (uint8_t)buf[i];

VirtualGameBox/periph/AVRGPIO.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
class AVRGPIO {
1313
protected:
14-
uint8_t data, direction;
14+
uint8_t data = 0, direction = 0;
1515

1616
protected:
1717
virtual bool getPinValue(int pin);

VirtualGameBox/periph/AVRTimer16.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ void AVRTimer16::reset() {
1414
cnt = icr = 0;
1515
irq = mask = 0;
1616
ctrl0 = ctrl1 = ctrl2 = 0;
17+
ticks = 0;
1718
}
1819

1920
void AVRTimer16::tick(unsigned int cycles) {

VirtualGameBox/periph/Display.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ void Display::update() {
7676
QColor c(((value >> 0) & 1) * 255,
7777
((value >> 1) & 1) * 255,
7878
((value >> 2) & 1) * 255);
79-
color.setRed((int) round(c.red() * frac) + color.red());
80-
color.setGreen((int) round(c.green() * frac) + color.green());
81-
color.setBlue((int) round(c.blue() * frac) + color.blue());
79+
color.setRed((int)(c.red() * frac) + color.red());
80+
color.setGreen((int)(c.green() * frac) + color.green());
81+
color.setBlue((int)(c.blue() * frac) + color.blue());
8282
}
8383
}
8484
}

0 commit comments

Comments
 (0)