chore: Release lemur version 0.8.1

Reviewed-on: #7

Cargo.toml

@@ -4,7 +4,7 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.7.1"
+version = "0.8.1"
 edition = "2024"
 
 [dependencies]
@@ -21,16 +21,17 @@ egui_extras = { version = "0.32", features = ["image"] }
 egui-notify = "0.20"
 egui-winit = "0.32"
 egui-wgpu = { version = "0.32", features = ["winit"] }
-elf = "0.8"
 fxprof-processed-profile = "0.8"
 fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
+gimli = "0.32"
 hex = "0.4"
 image = { version = "0.25", default-features = false, features = ["png"] }
 itertools = "0.14"
 normpath = "1"
 num-derive = "0.4"
 num-traits = "0.2"
+object = "0.37"
 oneshot = "0.1"
 pollster = "0.4"
 rand = "0.9"

build.Dockerfile

@@ -1,24 +1,39 @@
 # This Dockerfile produces a base image for builds.
 # It includes all dependencies necessary to cross-compile for Windows/MacOS/Linux.
 
-FROM crazymax/osxcross:latest-ubuntu AS osxcross
+FROM debian:bookworm AS osxcross
+ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+WORKDIR /build/osxcross
+ADD "https://github.com/tpoechtrager/osxcross.git#47936a512273bb3b414b5a2e83043c92eabc7ae7" .
+ADD "https://github.com/joseluisq/macosx-sdks/releases/download/14.5/MacOSX14.5.sdk.tar.xz" ./tarballs/MacOSX14.5.sdk.tar.xz
+RUN apt-get update && \
+    apt-get install -y ca-certificates
+COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
+RUN apt-get update && \
+    apt-get install -y bash bzip2 clang-20 git lld-20 llvm-20 make patch xz-utils && \
+    ln -s $(which clang-20) /usr/bin/clang && \
+    ln -s $(which clang++-20) /usr/bin/clang++ && \
+    ln -s $(which ld64.lld-20) /usr/bin/ld64.lld && \
+    SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
 
-FROM rust:latest
+FROM rust:1.89-bookworm
+ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
 RUN rustup target add x86_64-pc-windows-msvc && \
     rustup target add x86_64-apple-darwin && \
     rustup target add aarch64-apple-darwin && \
     apt-get update && \
-    apt-get install -y clang-19 lld-19 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
+    apt-get install -y clang-20 lld-20 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
     cargo install cargo-bundle xwin && \
     xwin --accept-license splat --output xwin && \
     rm -rf .xwin-cache && \
-    ln -s $(which clang-19) /usr/bin/clang && \
-    ln -s $(which clang++-19) /usr/bin/clang++
+    ln -s $(which clang-20) /usr/bin/clang && \
+    ln -s $(which clang++-20) /usr/bin/clang++
 COPY --from=osxcross /osxcross /osxcross
 
 ENV PATH="/osxcross/bin:$PATH" \
     LD_LIBRARY_PATH="/osxcross/lib" \
-    CC="clang-19" CXX="clang++-19" AR="llvm-ar-19" \
+    CC="clang-20" CXX="clang++-20" AR="llvm-ar-20" \
     CC_x86_64-apple-darwin="o64-clang" \
     CXX_x86_64-apple-darwin="o64-clang++" \
     CC_aarch64-apple-darwin="oa64-clang" \
@@ -27,10 +42,11 @@ ENV PATH="/osxcross/bin:$PATH" \
     CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-Clinker-plugin-lto -Clinker=clang -Clink-arg=-fuse-ld=lld" \
     SHROOMS_CFLAGS_x86_64-pc-windows-msvc="-flto" \
     CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_RUSTFLAGS="-Lnative=/xwin/crt/lib/x86_64 -Lnative=/xwin/sdk/lib/um/x86_64 -Lnative=/xwin/sdk/lib/ucrt/x86_64 -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld" \
-    CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-19" \
+    CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-20" \
     CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER="o64-clang" \
-    CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-19" \
+    CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-20" \
     CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="oa64-clang" \
-    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-19" \
-    RC_PATH="llvm-rc-19" \
+    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-20" \
+    RC_PATH="llvm-rc-20" \
     MACOSX_DEPLOYMENT_TARGET="14.5"
+ENTRYPOINT ["bash"]

llvm.sources

@@ -0,0 +1,4 @@
+Types: deb deb-src
+URIs: http://apt.llvm.org/bookworm/
+Suites: llvm-toolchain-bookworm-20
+Components: main

scripts/bundle.sh

@@ -0,0 +1,4 @@
+set -e
+
+docker build --pull -f build.Dockerfile -t lemur-build .
+MSYS_NO_PATHCONV=1 docker run -it --rm -v .:/app -w /app lemur-build /app/scripts/do-bundle.sh

scripts/release.sh

@@ -24,8 +24,7 @@ if ! command -v docker 2>&1 >/dev/null; then
     exit 1
 fi
 
-docker build -f build.Dockerfile -t lemur-build .
-MSYS_NO_PATHCONV=1 docker run -it --rm -v .:/app -w /app --entrypoint bash lemur-build /app/scripts/do-bundle.sh
+./scripts/bundle.sh
 
 body=$(cat <<EOF
 ## How to install

src/app.rs

@@ -217,10 +217,9 @@ impl ApplicationHandler<UserEvent> for Application {
                     .focused
                     .as_ref()
                     .and_then(|id| self.viewports.get_mut(id))
+                    && viewport.app.handle_gamepad_event(&event)
                 {
-                    if viewport.app.handle_gamepad_event(&event) {
-                        return;
-                    }
+                    return;
                 }
                 self.controllers.handle_gamepad_event(&event);
             }
@@ -301,10 +300,10 @@ impl ApplicationHandler<UserEvent> for Application {
 
     fn exiting(&mut self, _event_loop: &ActiveEventLoop) {
         let (sender, receiver) = oneshot::channel();
-        if self.client.send_command(EmulatorCommand::Exit(sender)) {
-            if let Err(error) = receiver.recv_timeout(Duration::from_secs(5)) {
-                error!(%error, "could not gracefully exit.");
-            }
+        if self.client.send_command(EmulatorCommand::Exit(sender))
+            && let Err(error) = receiver.recv_timeout(Duration::from_secs(5))
+        {
+            error!(%error, "could not gracefully exit.");
         }
     }
 }

src/emulator.rs

@@ -18,15 +18,20 @@ use tracing::{error, warn};
 
 use crate::{
     audio::Audio,
-    emulator::cart::Cart,
     graphics::TextureSink,
     memory::{MemoryRange, MemoryRegion},
 };
+use cart::Cart;
+pub use game_info::GameInfo;
+pub use inline_stack_map::InlineStack;
+use inline_stack_map::InlineStackMap;
 use shrooms_vb_core::{EXPECTED_FRAME_SIZE, Sim, StopReason};
 pub use shrooms_vb_core::{SimEvent, VBKey, VBRegister, VBWatchpointType};
 
 mod address_set;
 mod cart;
+mod game_info;
+mod inline_stack_map;
 mod shrooms_vb_core;
 
 #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
@@ -221,21 +226,19 @@ impl Emulator {
             self.sim_state[index].store(SimState::Ready, Ordering::Release);
         }
         let mut profiling = false;
-        if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref() {
-            if let Some(cart) = self.carts[index].as_ref() {
-                if profiler
-                    .send(ProfileEvent::Start {
-                        file_path: cart.file_path.clone(),
-                    })
-                    .is_ok()
-                {
-                    sim.monitor_events(true);
-                    profiling = true;
-                }
-            }
+        if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref()
+            && let Some(cart) = self.carts[index].as_ref()
+            && profiler
+                .send(ProfileEvent::Start {
+                    info: cart.info.clone(),
+                })
+                .is_ok()
+        {
+            sim.monitor_events(true, cart.info.inline_stack_map().clone());
+            profiling = true;
         }
         if !profiling {
-            sim.monitor_events(false);
+            sim.monitor_events(false, InlineStackMap::empty());
         }
 
         if self.sim_state[index].load(Ordering::Acquire) == SimState::Ready {
@@ -477,13 +480,15 @@ impl Emulator {
                 continue;
             }
             if let Some(p) = profiler {
+                let (event, inline_stack) = sim.take_profiler_updates();
                 if p.send(ProfileEvent::Update {
                     cycles,
-                    event: sim.take_sim_event(),
+                    event,
+                    inline_stack,
                 })
                 .is_err()
                 {
-                    sim.monitor_events(false);
+                    sim.monitor_events(false, InlineStackMap::empty());
                     *profiler = None;
                 }
             }
@@ -498,11 +503,11 @@ impl Emulator {
             let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
                 return true;
             };
-            if let Some(text) = sim.take_stdout() {
-                if stdout.send(text).is_err() {
-                    sim.watch_stdout(false);
-                    return false;
-                }
+            if let Some(text) = sim.take_stdout()
+                && stdout.send(text).is_err()
+            {
+                sim.watch_stdout(false);
+                return false;
             }
             true
         });
@@ -838,11 +843,12 @@ pub enum DebugEvent {
 
 pub enum ProfileEvent {
     Start {
-        file_path: PathBuf,
+        info: Arc<GameInfo>,
     },
     Update {
         cycles: u32,
         event: Option<SimEvent>,
+        inline_stack: Option<InlineStack>,
     },
 }
 

src/emulator/cart.rs

@@ -4,21 +4,24 @@ use std::{
     fs::{self, File},
     io::{Read, Seek as _, SeekFrom, Write as _},
     path::{Path, PathBuf},
+    sync::Arc,
 };
 
-use crate::emulator::SimId;
+use crate::emulator::{SimId, game_info::GameInfo};
 
 pub struct Cart {
     pub file_path: PathBuf,
     pub rom: Vec<u8>,
     sram_file: File,
     pub sram: Vec<u8>,
+    pub info: Arc<GameInfo>,
 }
 
 impl Cart {
     pub fn load(file_path: &Path, sim_id: SimId) -> Result<Self> {
         let rom = fs::read(file_path)?;
-        let rom = try_parse_elf(&rom).unwrap_or(rom);
+        let (rom, info) =
+            try_parse_elf(file_path, &rom).unwrap_or_else(|| (rom, GameInfo::empty(file_path)));
 
         let mut sram_file = File::options()
             .read(true)
@@ -46,6 +49,7 @@ impl Cart {
             rom,
             sram_file,
             sram,
+            info: Arc::new(info),
         })
     }
 
@@ -56,18 +60,40 @@ impl Cart {
     }
 }
 
-fn try_parse_elf(data: &[u8]) -> Option<Vec<u8>> {
-    let parsed = elf::ElfBytes::<elf::endian::AnyEndian>::minimal_parse(data).ok()?;
+fn try_parse_elf(file_path: &Path, data: &[u8]) -> Option<(Vec<u8>, GameInfo)> {
+    use object::read::elf::FileHeader;
+    let program = match object::FileKind::parse(data).ok()? {
+        object::FileKind::Elf32 => {
+            let header = object::elf::FileHeader32::parse(data).ok()?;
+            parse_elf_program(header, data)?
+        }
+        object::FileKind::Elf64 => {
+            let header = object::elf::FileHeader64::parse(data).ok()?;
+            parse_elf_program(header, data)?
+        }
+        _ => return None,
+    };
+    let info = GameInfo::new(file_path, data).unwrap_or_else(|_| GameInfo::empty(file_path));
+    Some((program, info))
+}
+
+fn parse_elf_program<Elf: object::read::elf::FileHeader<Endian = object::Endianness>>(
+    header: &Elf,
+    data: &[u8],
+) -> Option<Vec<u8>> {
+    use object::read::elf::ProgramHeader;
+    let endian = header.endian().ok()?;
     let mut bytes = vec![];
     let mut pstart = None;
-    for phdr in parsed.segments()? {
-        if phdr.p_filesz == 0 {
+    for phdr in header.program_headers(endian, data).ok()? {
+        let pma = phdr.p_paddr(endian).into();
+        if pma < 0x07000000 || phdr.p_filesz(endian).into() == 0 {
             continue;
         }
-        let start = pstart.unwrap_or(phdr.p_paddr);
+        let start = pstart.unwrap_or(pma);
         pstart = Some(start);
-        bytes.resize((phdr.p_paddr - start) as usize, 0);
-        let data = parsed.segment_data(&phdr).ok()?;
+        bytes.resize((pma - start) as usize, 0);
+        let data = phdr.data(endian, data).ok()?;
         bytes.extend_from_slice(data);
     }
     Some(bytes)

src/emulator/game_info.rs

@@ -0,0 +1,201 @@
+use std::{borrow::Cow, path::Path, sync::Arc};
+
+use anyhow::{Result, bail};
+use fxprof_processed_profile::{LibraryInfo, Symbol, SymbolTable, debugid::DebugId};
+use object::{Object, ObjectSection, ObjectSymbol};
+use wholesym::samply_symbols::{DebugIdExt, demangle_any};
+
+use crate::emulator::inline_stack_map::{InlineStackMap, InlineStackMapBuilder};
+
+#[derive(Debug)]
+pub struct GameInfo {
+    library_info: LibraryInfo,
+    inline_stack_map: InlineStackMap,
+}
+
+impl GameInfo {
+    pub fn new(file_path: &Path, input: &[u8]) -> Result<Self> {
+        let file = object::File::parse(input)?;
+
+        let (name, path) = name_and_path(file_path);
+        let debug_id = file
+            .build_id()?
+            .map(|id| DebugId::from_identifier(id, true))
+            .unwrap_or_default();
+        let code_id = file.build_id()?.map(hex::encode);
+        let mut symbols = vec![];
+        for sym in file.symbols() {
+            symbols.push(Symbol {
+                address: sym.address() as u32,
+                size: Some(sym.size() as u32),
+                name: demangle_any(sym.name()?),
+            });
+        }
+
+        let inline_stack_map =
+            build_inline_stack_map(file).unwrap_or_else(|_| InlineStackMap::empty());
+
+        let library_info = LibraryInfo {
+            name: name.clone(),
+            debug_name: name,
+            path: path.clone(),
+            debug_path: path,
+            debug_id,
+            code_id,
+            arch: None,
+            symbol_table: Some(Arc::new(SymbolTable::new(symbols))),
+        };
+
+        Ok(Self {
+            library_info,
+            inline_stack_map,
+        })
+    }
+
+    pub fn empty(file_path: &Path) -> Self {
+        let (name, path) = name_and_path(file_path);
+        let library_info = LibraryInfo {
+            name: name.clone(),
+            debug_name: name,
+            path: path.clone(),
+            debug_path: path,
+            debug_id: DebugId::default(),
+            code_id: None,
+            arch: None,
+            symbol_table: None,
+        };
+        let inline_stack_map = InlineStackMap::empty();
+        Self {
+            library_info,
+            inline_stack_map,
+        }
+    }
+
+    pub fn name(&self) -> &str {
+        &self.library_info.name
+    }
+
+    pub fn library_info(&self) -> &LibraryInfo {
+        &self.library_info
+    }
+
+    pub fn inline_stack_map(&self) -> &InlineStackMap {
+        &self.inline_stack_map
+    }
+}
+
+fn build_inline_stack_map(file: object::File) -> Result<InlineStackMap> {
+    let endian = if file.is_little_endian() {
+        gimli::RunTimeEndian::Little
+    } else {
+        gimli::RunTimeEndian::Big
+    };
+    fn load_section<'a>(file: &'a object::File, id: gimli::SectionId) -> Result<Cow<'a, [u8]>> {
+        let input = match file.section_by_name(id.name()) {
+            Some(section) => section.uncompressed_data()?,
+            None => Cow::Owned(vec![]),
+        };
+        Ok(input)
+    }
+    let dorf = gimli::DwarfSections::load(|id| load_section(&file, id))?;
+    let dorf = dorf.borrow(|sec| gimli::EndianSlice::new(sec, endian));
+    let mut units = dorf.units();
+    let mut frames = InlineStackMap::builder();
+    while let Some(header) = units.next()? {
+        let unit = dorf.unit(header)?;
+        let mut entree = unit.entries_tree(None)?;
+        let root = entree.root()?;
+        let mut ctx = ParseContext {
+            dorf: &dorf,
+            unit: &unit,
+            frames: &mut frames,
+        };
+        parse_inline(&mut ctx, root)?;
+    }
+    Ok(frames.build())
+}
+
+type Reader<'a> = gimli::EndianSlice<'a, gimli::RunTimeEndian>;
+
+struct ParseContext<'a> {
+    dorf: &'a gimli::Dwarf<Reader<'a>>,
+    unit: &'a gimli::Unit<Reader<'a>>,
+    frames: &'a mut InlineStackMapBuilder,
+}
+impl ParseContext<'_> {
+    fn name_attr(&self, attr: gimli::AttributeValue<Reader>) -> Result<Option<String>> {
+        match attr {
+            gimli::AttributeValue::DebugInfoRef(offset) => {
+                let mut units = self.dorf.units();
+                while let Some(header) = units.next()? {
+                    if let Some(offset) = offset.to_unit_offset(&header) {
+                        let unit = self.dorf.unit(header)?;
+                        return self.name_entry(&unit, offset);
+                    }
+                }
+                Ok(None)
+            }
+            gimli::AttributeValue::UnitRef(offset) => self.name_entry(self.unit, offset),
+            other => {
+                bail!("unrecognized attr {other:?}");
+            }
+        }
+    }
+
+    fn name_entry(
+        &self,
+        unit: &gimli::Unit<Reader>,
+        offset: gimli::UnitOffset,
+    ) -> Result<Option<String>> {
+        let abbreviations = self.dorf.abbreviations(&unit.header)?;
+        let mut entries = unit.header.entries_raw(&abbreviations, Some(offset))?;
+        let Some(abbrev) = entries.read_abbreviation()? else {
+            return Ok(None);
+        };
+        let mut name = None;
+        for spec in abbrev.attributes() {
+            let attr = entries.read_attribute(*spec)?;
+            if attr.name() == gimli::DW_AT_linkage_name
+                || (attr.name() == gimli::DW_AT_name && name.is_none())
+            {
+                name = Some(self.dorf.attr_string(unit, attr.value())?)
+            }
+        }
+        Ok(name.map(|n| demangle_any(&String::from_utf8_lossy(&n))))
+    }
+}
+
+fn parse_inline(ctx: &mut ParseContext, node: gimli::EntriesTreeNode<Reader>) -> Result<()> {
+    if node.entry().tag() == gimli::DW_TAG_inlined_subroutine
+        && let Some(attr) = node.entry().attr_value(gimli::DW_AT_abstract_origin)?
+        && let Some(name) = ctx.name_attr(attr)?
+    {
+        let name = Arc::new(name);
+        let mut ranges = ctx.dorf.die_ranges(ctx.unit, node.entry())?;
+        while let Some(range) = ranges.next()? {
+            let start = range.begin as u32;
+            let end = range.end as u32;
+            ctx.frames.add(start, end, name.clone());
+        }
+    }
+    let mut children = node.children();
+    while let Some(child) = children.next()? {
+        parse_inline(ctx, child)?;
+    }
+    Ok(())
+}
+
+fn name_and_path(file_path: &Path) -> (String, String) {
+    let normalized = normpath::PathExt::normalize(file_path);
+    let path = normalized
+        .as_ref()
+        .map(|n| n.as_path())
+        .unwrap_or(file_path);
+
+    let name = match path.file_stem() {
+        Some(s) => s.to_string_lossy().into_owned(),
+        None => "game".to_string(),
+    };
+    let path = path.to_string_lossy().into_owned();
+    (name, path)
+}

src/emulator/inline_stack_map.rs

@@ -0,0 +1,87 @@
+use std::{
+    collections::{BTreeMap, HashMap},
+    sync::Arc,
+};
+
+pub type InlineStack = Arc<Vec<Arc<String>>>;
+
+#[derive(Debug, Clone)]
+pub struct InlineStackMap {
+    entries: Vec<(u32, InlineStack)>,
+    empty: InlineStack,
+}
+
+impl InlineStackMap {
+    pub fn empty() -> Self {
+        Self {
+            entries: vec![],
+            empty: Arc::new(vec![]),
+        }
+    }
+    pub fn builder() -> InlineStackMapBuilder {
+        InlineStackMapBuilder {
+            events: BTreeMap::new(),
+        }
+    }
+    pub fn get(&self, address: u32) -> &InlineStack {
+        match self.entries.binary_search_by_key(&address, |(a, _)| *a) {
+            Ok(index) => self.entries.get(index),
+            Err(after) => after.checked_sub(1).and_then(|i| self.entries.get(i)),
+        }
+        .map(|(_, s)| s)
+        .unwrap_or(&self.empty)
+    }
+}
+
+#[derive(Default)]
+struct Event {
+    end: usize,
+    start: Vec<Arc<String>>,
+}
+
+pub struct InlineStackMapBuilder {
+    events: BTreeMap<u32, Event>,
+}
+
+impl InlineStackMapBuilder {
+    pub fn add(&mut self, start: u32, end: u32, name: Arc<String>) {
+        self.events.entry(start).or_default().start.push(name);
+        self.events.entry(end).or_default().end += 1;
+    }
+
+    pub fn build(self) -> InlineStackMap {
+        let empty = Arc::new(vec![]);
+        let mut entries = vec![];
+        let mut stack_indexes = vec![];
+        let mut stack = vec![];
+        let mut string_dedup = HashMap::new();
+        let mut stack_dedup = BTreeMap::new();
+        stack_dedup.insert(vec![], empty.clone());
+
+        for (address, event) in self.events {
+            for _ in 0..event.end {
+                stack.pop();
+                stack_indexes.pop();
+            }
+            for call in event.start {
+                if let Some(index) = string_dedup.get(&call) {
+                    stack.push(call);
+                    stack_indexes.push(*index);
+                } else {
+                    let index = string_dedup.len();
+                    string_dedup.insert(call.clone(), index);
+                    stack.push(call);
+                    stack_indexes.push(index);
+                }
+            }
+            if let Some(stack) = stack_dedup.get(&stack_indexes) {
+                entries.push((address, stack.clone()));
+            } else {
+                let stack = Arc::new(stack.clone());
+                stack_dedup.insert(stack_indexes.clone(), stack.clone());
+                entries.push((address, stack));
+            }
+        }
+        InlineStackMap { entries, empty }
+    }
+}

src/emulator/shrooms_vb_core.rs

@@ -1,10 +1,12 @@
-use std::{borrow::Cow, ffi::c_void, ptr, slice};
+use std::{borrow::Cow, ffi::c_void, ptr, slice, sync::Arc};
 
 use anyhow::{Result, anyhow};
 use bitflags::bitflags;
 use num_derive::{FromPrimitive, ToPrimitive};
 use serde::{Deserialize, Serialize};
 
+use crate::emulator::inline_stack_map::{InlineStack, InlineStackMap};
+
 use super::address_set::AddressSet;
 
 #[repr(C)]
@@ -206,11 +208,9 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c
     if data.monitor.enabled {
         // SAFETY: length is the length of code, in elements
         let code = unsafe { slice::from_raw_parts(code, length as usize) };
-        if data.monitor.detect_event(sim, address, code) {
-            // Something interesting will happen after this instruction is run.
-            // The on_fetch callback will fire when it does.
-            unsafe { vb_set_fetch_callback(sim, Some(on_fetch)) };
-        }
+        data.monitor.detect_event(sim, address, code);
+        // Something interesting will happen after this instruction is run.
+        // We'll react in the on_fetch callback it does.
     }
 
     let mut stopped = data.stop_reason.is_some() || data.monitor.event.is_some();
@@ -231,7 +231,7 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c
 extern "C" fn on_fetch(
     sim: *mut VB,
     _fetch: c_int,
-    _address: u32,
+    address: u32,
     _value: *mut i32,
     _cycles: *mut u32,
 ) -> c_int {
@@ -239,9 +239,13 @@ extern "C" fn on_fetch(
     // There is no way for the userdata to be null or otherwise invalid.
     let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
     data.monitor.event = data.monitor.queued_event.take();
+    data.monitor.new_inline_stack = data.monitor.detect_new_inline_stack(address);
     unsafe { vb_set_exception_callback(sim, Some(on_exception)) };
-    unsafe { vb_set_fetch_callback(sim, None) };
-    1
+    if data.monitor.event.is_some() || data.monitor.new_inline_stack.is_some() {
+        1
+    } else {
+        0
+    }
 }
 
 #[unsafe(no_mangle)]
@@ -249,17 +253,21 @@ extern "C" fn on_exception(sim: *mut VB, cause: *mut u16) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
     let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
-    data.monitor.event = data.monitor.queued_event.take();
     let cause = unsafe { *cause };
     let pc = if cause == 0xff70 {
         0xffffff60
     } else {
         (cause & 0xfff0) as u32 | 0xffff0000
     };
+    data.monitor.event = data.monitor.queued_event.take();
+    data.monitor.new_inline_stack = data.monitor.detect_new_inline_stack(pc);
     data.monitor.queued_event = Some(SimEvent::Interrupt(cause, pc));
     unsafe { vb_set_exception_callback(sim, None) };
-    unsafe { vb_set_fetch_callback(sim, Some(on_fetch)) };
-    if data.monitor.event.is_some() { 1 } else { 0 }
+    if data.monitor.event.is_some() || data.monitor.new_inline_stack.is_some() {
+        1
+    } else {
+        0
+    }
 }
 
 #[unsafe(no_mangle)]
@@ -292,7 +300,7 @@ extern "C" fn on_read(
 extern "C" fn on_write(
     sim: *mut VB,
     address: u32,
-    _type: VBDataType,
+    typ_: VBDataType,
     value: *mut i32,
     _cycles: *mut u32,
     _cancel: *mut c_int,
@@ -309,6 +317,29 @@ extern "C" fn on_write(
         }
     }
 
+    // If we have profiling enabled, track custom markers
+    if data.monitor.enabled {
+        let normalized_hw_address = address & 0x0700003f;
+        if normalized_hw_address == 0x02000038 && matches!(typ_, VBDataType::S32) {
+            assert!(data.monitor.queued_event.is_none());
+            // The game has written the address of a null-terminated string
+            // (whose length is at most 64 bytes). Read that string.
+            let str_address = unsafe { *value } as u32;
+            let mut bytes = [0u8; 64];
+            let mut len = 0;
+            for (dst, src_address) in bytes.iter_mut().zip(str_address..str_address + 64) {
+                let char = unsafe { vb_read(sim, src_address, VBDataType::U8) } as u8;
+                if char == 0 {
+                    break;
+                }
+                *dst = char;
+                len += 1;
+            }
+            let name = String::from_utf8_lossy(&bytes[..len]).into_owned();
+            data.monitor.queued_event = Some(SimEvent::Marker(Cow::Owned(name)));
+        }
+    }
+
     if let Some(start) = data.write_watchpoints.start_of_range_containing(address) {
         let watch = if data.read_watchpoints.contains(address) {
             VBWatchpointType::Access
@@ -339,18 +370,35 @@ struct EventMonitor {
     event: Option<SimEvent>,
     queued_event: Option<SimEvent>,
     just_halted: bool,
+    inline_stack_map: InlineStackMap,
+    new_inline_stack: Option<InlineStack>,
+    last_inline_stack: InlineStack,
 }
 
 impl EventMonitor {
     fn new() -> Self {
+        let inline_stack_map = InlineStackMap::empty();
+        let last_inline_stack = inline_stack_map.get(0).clone();
         Self {
             enabled: false,
             event: None,
             queued_event: None,
             just_halted: false,
+            inline_stack_map,
+            new_inline_stack: None,
+            last_inline_stack,
         }
     }
 
+    fn detect_new_inline_stack(&mut self, address: u32) -> Option<InlineStack> {
+        let stack = self.inline_stack_map.get(address);
+        if Arc::ptr_eq(stack, &self.last_inline_stack) {
+            return None;
+        }
+        self.last_inline_stack = stack.clone();
+        Some(stack.clone())
+    }
+
     fn detect_event(&mut self, sim: *mut VB, address: u32, code: &[u16]) -> bool {
         self.queued_event = self.do_detect_event(sim, address, code);
         self.queued_event.is_some()
@@ -440,6 +488,10 @@ impl VBState {
             || !self.read_watchpoints.is_empty()
             || !self.write_watchpoints.is_empty()
     }
+
+    fn needs_write_callback(&self) -> bool {
+        self.stdout.is_some() || self.monitor.enabled || !self.write_watchpoints.is_empty()
+    }
 }
 
 pub enum StopReason {
@@ -492,20 +544,30 @@ impl Sim {
         unsafe { vb_reset(self.sim) };
     }
 
-    pub fn monitor_events(&mut self, enabled: bool) {
+    pub fn monitor_events(&mut self, enabled: bool, inline_stack_map: InlineStackMap) {
         let state = self.get_state();
         state.monitor.enabled = enabled;
         state.monitor.event = None;
         state.monitor.queued_event = None;
+        state.monitor.new_inline_stack = None;
+        state.monitor.last_inline_stack = inline_stack_map.get(0).clone();
+        state.monitor.inline_stack_map = inline_stack_map;
         if enabled {
             unsafe { vb_set_execute_callback(self.sim, Some(on_execute)) };
             unsafe { vb_set_exception_callback(self.sim, Some(on_exception)) };
+            unsafe { vb_set_fetch_callback(self.sim, Some(on_fetch)) };
+            unsafe { vb_set_write_callback(self.sim, Some(on_write)) };
         } else {
-            if !state.needs_execute_callback() {
+            let needs_execute = state.needs_execute_callback();
+            let needs_write = state.needs_write_callback();
+            if !needs_execute {
                 unsafe { vb_set_execute_callback(self.sim, None) };
             }
             unsafe { vb_set_exception_callback(self.sim, None) };
             unsafe { vb_set_fetch_callback(self.sim, None) };
+            if !needs_write {
+                unsafe { vb_set_write_callback(self.sim, None) };
+            }
         }
     }
 
@@ -747,9 +809,10 @@ impl Sim {
     fn remove_write_watchpoint(&mut self, address: u32, length: usize) {
         let state = self.get_state();
         state.write_watchpoints.remove(address, length);
+        let needs_write = state.needs_write_callback();
         let needs_execute = state.needs_execute_callback();
         if state.write_watchpoints.is_empty() {
-            if state.stdout.is_none() {
+            if !needs_write {
                 unsafe { vb_set_write_callback(self.sim, None) };
             }
             if !needs_execute {
@@ -773,12 +836,15 @@ impl Sim {
         data.breakpoints.clear();
         data.read_watchpoints.clear();
         data.write_watchpoints.clear();
-        let needs_write = data.stdout.is_some();
+        let needs_write = data.needs_write_callback();
+        let needs_execute = data.needs_execute_callback();
         unsafe { vb_set_read_callback(self.sim, None) };
         if !needs_write {
             unsafe { vb_set_write_callback(self.sim, None) };
         }
-        unsafe { vb_set_execute_callback(self.sim, None) };
+        if !needs_execute {
+            unsafe { vb_set_execute_callback(self.sim, None) };
+        }
     }
 
     pub fn watch_stdout(&mut self, watch: bool) {
@@ -790,7 +856,7 @@ impl Sim {
             }
         } else {
             data.stdout.take();
-            if data.write_watchpoints.is_empty() {
+            if !data.needs_write_callback() {
                 unsafe { vb_set_write_callback(self.sim, None) };
             }
         }
@@ -816,9 +882,11 @@ impl Sim {
         reason
     }
 
-    pub fn take_sim_event(&mut self) -> Option<SimEvent> {
+    pub fn take_profiler_updates(&mut self) -> (Option<SimEvent>, Option<InlineStack>) {
         let data = self.get_state();
-        data.monitor.event.take()
+        let event = data.monitor.event.take();
+        let inline_stack = data.monitor.new_inline_stack.take();
+        (event, inline_stack)
     }
 
     fn get_state(&mut self) -> &mut VBState {

src/memory.rs

@@ -169,7 +169,7 @@ impl MemoryRef<'_> {
         T::from_bytes(&self.inner[from..to])
     }
 
-    pub fn range<T: MemoryValue>(&self, start: usize, count: usize) -> MemoryIter<T> {
+    pub fn range<T: MemoryValue>(&self, start: usize, count: usize) -> MemoryIter<'_, T> {
         let from = start * size_of::<T>();
         let to = from + (count * size_of::<T>());
         MemoryIter::new(&self.inner[from..to])

src/profiler.rs

@@ -1,5 +1,4 @@
 use std::{
-    path::PathBuf,
     sync::{Arc, Mutex},
     thread,
 };
@@ -7,13 +6,14 @@ use std::{
 use anyhow::Result;
 use tokio::{select, sync::mpsc};
 
-use crate::emulator::{EmulatorClient, EmulatorCommand, ProfileEvent, SimEvent, SimId};
+use crate::emulator::{
+    EmulatorClient, EmulatorCommand, GameInfo, InlineStack, ProfileEvent, SimEvent, SimId,
+};
 use recording::Recording;
 use state::ProgramState;
 
 mod recording;
 mod state;
-mod symbols;
 
 pub struct Profiler {
     sim_id: SimId,
@@ -132,12 +132,19 @@ async fn run_profile(
 
 async fn handle_event(event: ProfileEvent, session: &mut ProfilerSession) -> Result<()> {
     match event {
-        ProfileEvent::Start { file_path } => session.start_profiling(file_path).await,
-        ProfileEvent::Update { cycles, event } => {
+        ProfileEvent::Start { info } => session.start_profiling(info).await,
+        ProfileEvent::Update {
+            cycles,
+            event,
+            inline_stack,
+        } => {
             session.track_elapsed_cycles(cycles);
             if let Some(event) = event {
                 session.track_event(event)?;
             }
+            if let Some(stack) = inline_stack {
+                session.track_inline_stack(stack);
+            }
         }
     }
     Ok(())
@@ -199,8 +206,8 @@ impl ProfilerSession {
         }
     }
 
-    async fn start_profiling(&mut self, file_path: PathBuf) {
-        let program = ProgramState::new(file_path).await;
+    async fn start_profiling(&mut self, info: Arc<GameInfo>) {
+        let program = ProgramState::new(info).await;
         let recording = if self.recording.is_some() {
             Some(Recording::new(&program))
         } else {
@@ -235,6 +242,12 @@ impl ProfilerSession {
         }
     }
 
+    fn track_inline_stack(&mut self, inline_stack: InlineStack) {
+        if let Some(program) = &mut self.program {
+            program.track_inline_stack(inline_stack);
+        }
+    }
+
     fn start_recording(&mut self) {
         if let Some(program) = &self.program {
             self.recording = Some(Recording::new(program));

src/profiler/recording.rs

@@ -24,10 +24,8 @@ impl Recording {
         let process =
             profile.add_process(state.name(), 1, Timestamp::from_nanos_since_reference(0));
 
-        if let Some(symbol_file) = state.symbol_file() {
-            let lib = profile.add_lib(symbol_file.library_info().clone());
-            profile.add_lib_mapping(process, lib, 0x00000000, 0xffffffff, 0);
-        }
+        let lib = profile.add_lib(state.library_info().clone());
+        profile.add_lib_mapping(process, lib, 0x00000000, 0xffffffff, 0);
 
         let mut me = Self {
             profile,
@@ -91,14 +89,21 @@ impl Recording {
         thread: ThreadHandle,
         frames: &[StackFrame],
     ) -> Option<StackHandle> {
-        self.profile.intern_stack_frames(
-            thread,
-            frames.iter().map(|f| FrameInfo {
-                frame: Frame::InstructionPointer(f.address as u64),
-                category_pair: CategoryHandle::OTHER.into(),
-                flags: FrameFlags::empty(),
-            }),
-        )
+        let frames = frames
+            .iter()
+            .map(|f| {
+                let frame = match f {
+                    StackFrame::Address(address) => Frame::InstructionPointer(*address as u64),
+                    StackFrame::Label(label) => Frame::Label(self.profile.intern_string(label)),
+                };
+                FrameInfo {
+                    frame,
+                    category_pair: CategoryHandle::OTHER.into(),
+                    flags: FrameFlags::empty(),
+                }
+            })
+            .collect::<Vec<_>>();
+        self.profile.intern_stack_frames(thread, frames.into_iter())
     }
 }
 

src/profiler/state.rs

@@ -1,54 +1,39 @@
-use std::{collections::HashMap, path::PathBuf};
+use std::{collections::HashMap, sync::Arc};
 
 use anyhow::{Result, bail};
+use fxprof_processed_profile::LibraryInfo;
 
-use crate::profiler::symbols::SymbolFile;
+use crate::emulator::{GameInfo, InlineStack};
 
 pub struct ProgramState {
-    name: String,
-    symbol_file: Option<SymbolFile>,
+    info: Arc<GameInfo>,
     call_stacks: HashMap<u16, Vec<StackFrame>>,
     context_stack: Vec<u16>,
 }
 
-pub struct StackFrame {
-    pub address: u32,
+pub enum StackFrame {
+    Address(u32),
+    Label(Arc<String>),
 }
 
 pub const RESET_CODE: u16 = 0xfff0;
 impl ProgramState {
-    pub async fn new(file_path: PathBuf) -> Self {
-        let symbol_file = SymbolFile::load(&file_path).await.ok();
-        let name = symbol_file
-            .as_ref()
-            .map(|f| f.name().to_string())
-            .or_else(|| {
-                file_path
-                    .file_stem()
-                    .map(|s| s.to_string_lossy().into_owned())
-            })
-            .unwrap_or_else(|| "game".to_string());
+    pub async fn new(info: Arc<GameInfo>) -> Self {
         let mut call_stacks = HashMap::new();
-        call_stacks.insert(
-            RESET_CODE,
-            vec![StackFrame {
-                address: 0xfffffff0,
-            }],
-        );
+        call_stacks.insert(RESET_CODE, vec![StackFrame::Address(0xfffffff0)]);
         Self {
-            name,
-            symbol_file,
+            info,
             call_stacks,
             context_stack: vec![RESET_CODE],
         }
     }
 
     pub fn name(&self) -> &str {
-        &self.name
+        self.info.name()
     }
 
-    pub fn symbol_file(&self) -> Option<&SymbolFile> {
-        self.symbol_file.as_ref()
+    pub fn library_info(&self) -> &LibraryInfo {
+        self.info.library_info()
     }
 
     pub fn current_stack(&self) -> Option<(u16, &[StackFrame])> {
@@ -64,7 +49,7 @@ impl ProgramState {
         let Some(stack) = self.call_stacks.get_mut(code) else {
             bail!("missing stack {code:04x}");
         };
-        stack.push(StackFrame { address });
+        stack.push(StackFrame::Address(address));
         Ok(())
     }
 
@@ -100,7 +85,7 @@ impl ProgramState {
         self.context_stack.push(code);
         if self
             .call_stacks
-            .insert(code, vec![StackFrame { address }])
+            .insert(code, vec![StackFrame::Address(address)])
             .is_some()
         {
             bail!("{code:04x} fired twice");
@@ -120,4 +105,20 @@ impl ProgramState {
         }
         Ok(())
     }
+
+    pub fn track_inline_stack(&mut self, inline_stack: InlineStack) {
+        let Some(code) = self.context_stack.last() else {
+            return;
+        };
+        let Some(call_stack) = self.call_stacks.get_mut(code) else {
+            return;
+        };
+        while call_stack
+            .pop_if(|f| matches!(f, StackFrame::Label(_)))
+            .is_some()
+        {}
+        for label in inline_stack.iter() {
+            call_stack.push(StackFrame::Label(label.clone()));
+        }
+    }
 }

src/profiler/symbols.rs

@@ -1,67 +0,0 @@
-use std::{path::Path, sync::Arc};
-
-use anyhow::Result;
-use fxprof_processed_profile::{LibraryInfo, Symbol, SymbolTable};
-use wholesym::{SymbolManager, samply_symbols::demangle_any};
-
-pub struct SymbolFile {
-    library_info: LibraryInfo,
-}
-
-impl SymbolFile {
-    pub async fn load(file_path: &Path) -> Result<Self> {
-        let normalized = normpath::PathExt::normalize(file_path)?;
-        let library_info =
-            SymbolManager::library_info_for_binary_at_path(normalized.as_path(), None).await?;
-
-        let symbol_manager = SymbolManager::with_config(Default::default());
-        let symbol_map = symbol_manager
-            .load_symbol_map_for_binary_at_path(normalized.as_path(), None)
-            .await?;
-
-        let name = library_info
-            .name
-            .or_else(|| {
-                normalized
-                    .file_name()
-                    .map(|n| n.to_string_lossy().into_owned())
-            })
-            .unwrap_or("game".to_string());
-        let debug_name = library_info.debug_name.unwrap_or_else(|| name.clone());
-        let path = library_info
-            .path
-            .unwrap_or_else(|| normalized.into_os_string().to_string_lossy().into_owned());
-        let debug_path = library_info.debug_path.unwrap_or_else(|| path.clone());
-        let debug_id = library_info.debug_id.unwrap_or_default();
-        let code_id = library_info.code_id.map(|id| id.to_string());
-        let arch = library_info.arch;
-        let symbols = symbol_map
-            .iter_symbols()
-            .map(|(address, name)| Symbol {
-                address: address + 0x07000000,
-                size: None,
-                name: demangle_any(&name),
-            })
-            .collect();
-        Ok(Self {
-            library_info: LibraryInfo {
-                name,
-                debug_name,
-                path,
-                debug_path,
-                debug_id,
-                code_id,
-                arch,
-                symbol_table: Some(Arc::new(SymbolTable::new(symbols))),
-            },
-        })
-    }
-
-    pub fn name(&self) -> &str {
-        &self.library_info.name
-    }
-
-    pub fn library_info(&self) -> &LibraryInfo {
-        &self.library_info
-    }
-}

src/window/game.rs

@@ -462,7 +462,7 @@ impl GameWindow {
         self.config = new_config;
     }
 
-    fn button_for(&self, ctx: &Context, text: &str, command: Command) -> Button {
+    fn button_for(&self, ctx: &Context, text: &str, command: Command) -> Button<'_> {
         let button = Button::new(text);
         match self.shortcuts.shortcut_for(command) {
             Some(shortcut) => button.shortcut_text(ctx.format_shortcut(&shortcut)),

src/window/hotkeys.rs

@@ -62,8 +62,8 @@ impl HotkeysWindow {
                     }
                 });
         });
-        if let Some(command) = self.now_binding {
-            if let Some(shortcut) = ui.input_mut(|i| {
+        if let Some(command) = self.now_binding
+            && let Some(shortcut) = ui.input_mut(|i| {
                 i.events.iter().find_map(|event| match event {
                     Event::Key {
                         key,
@@ -73,10 +73,10 @@ impl HotkeysWindow {
                     } => Some(KeyboardShortcut::new(*modifiers, *key)),
                     _ => None,
                 })
-            }) {
-                self.shortcuts.set(command, shortcut);
-                self.now_binding = None;
-            }
+            })
+        {
+            self.shortcuts.set(command, shortcut);
+            self.now_binding = None;
         }
     }
 

src/window/profile.rs

@@ -1,17 +1,18 @@
 use std::{fs, time::Duration};
 
 use anyhow::Result;
-use egui::{Button, CentralPanel, Checkbox, ViewportBuilder, ViewportId};
+use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder, ViewportId};
 use egui_notify::{Anchor, Toast, Toasts};
 
 use crate::{
-    emulator::{EmulatorClient, SimId},
+    emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId},
     profiler::{Profiler, ProfilerStatus},
     window::AppWindow,
 };
 
 pub struct ProfileWindow {
     sim_id: SimId,
+    client: EmulatorClient,
     profiler: Profiler,
     toasts: Toasts,
 }
@@ -20,6 +21,7 @@ impl ProfileWindow {
     pub fn new(sim_id: SimId, client: EmulatorClient) -> Self {
         Self {
             sim_id,
+            client: client.clone(),
             profiler: Profiler::new(sim_id, client),
             toasts: Toasts::new()
                 .with_anchor(Anchor::BottomLeft)
@@ -33,6 +35,10 @@ impl ProfileWindow {
     }
 
     fn finish_recording(&mut self) {
+        let pause = matches!(self.client.emulator_state(), EmulatorState::Running);
+        if pause {
+            self.client.send_command(EmulatorCommand::Pause);
+        }
         match self.try_finish_recording() {
             Ok(Some(path)) => {
                 let mut toast = Toast::info(format!("Saved to {path}"));
@@ -46,6 +52,9 @@ impl ProfileWindow {
                 self.toasts.add(toast);
             }
         }
+        if pause {
+            self.client.send_command(EmulatorCommand::Resume);
+        }
     }
 
     fn try_finish_recording(&mut self) -> Result<Option<String>> {
@@ -84,8 +93,32 @@ impl AppWindow for ProfileWindow {
         let status = self.profiler.status();
         let recording = matches!(status, ProfilerStatus::Recording);
         CentralPanel::default().show(ctx, |ui| {
+            ui.horizontal_wrapped(|ui| {
+                ui.spacing_mut().item_spacing.x = 0.0;
+                ui.add(
+                    Label::new(
+                        "Use this tool to record performance profiles of your game, for use in ",
+                    )
+                    .wrap_mode(egui::TextWrapMode::Wrap),
+                );
+                ui.hyperlink("https://profiler.firefox.com");
+                ui.label(".");
+            });
+            ui.horizontal_wrapped(|ui| {
+                ui.spacing_mut().item_spacing.x = 0.0;
+                ui.add(
+                    Label::new("For more instructions, see ").wrap_mode(egui::TextWrapMode::Wrap),
+                );
+                ui.hyperlink_to(
+                    "the Lemur wiki",
+                    "https://git.virtual-boy.com/PVB/lemur/wiki/Profiling-with-Lemur",
+                );
+                ui.label(".");
+            });
+            ui.separator();
+
             let mut enabled = status.enabled();
-            let enabled_checkbox = Checkbox::new(&mut enabled, "Profiling enabled?");
+            let enabled_checkbox = Checkbox::new(&mut enabled, "Enable profiling");
             if ui.add_enabled(!recording, enabled_checkbox).changed() {
                 if enabled {
                     self.profiler.enable();
@@ -93,23 +126,26 @@ impl AppWindow for ProfileWindow {
                     self.profiler.disable();
                 }
             }
-
-            ui.horizontal(|ui| {
-                if !recording {
-                    let record_button = Button::new("Record");
-                    let can_record = matches!(status, ProfilerStatus::Enabled);
-                    if ui.add_enabled(can_record, record_button).clicked() {
-                        self.profiler.start_recording();
+            if !enabled {
+                ui.label("Enabling profiling will restart your current game.");
+            } else {
+                ui.horizontal(|ui| {
+                    if !recording {
+                        let record_button = Button::new("Record");
+                        let can_record = matches!(status, ProfilerStatus::Enabled);
+                        if ui.add_enabled(can_record, record_button).clicked() {
+                            self.profiler.start_recording();
+                        }
+                    } else {
+                        if ui.button("Finish recording").clicked() {
+                            self.finish_recording();
+                        }
+                        if ui.button("Cancel recording").clicked() {
+                            self.profiler.cancel_recording();
+                        }
                     }
-                } else {
-                    if ui.button("Finish recording").clicked() {
-                        self.finish_recording();
-                    }
-                    if ui.button("Cancel recording").clicked() {
-                        self.profiler.cancel_recording();
-                    }
-                }
-            });
+                });
+            }
 
             match &status {
                 ProfilerStatus::Recording => {

src/window/utils.rs

@@ -86,10 +86,10 @@ impl UiExt for Ui {
                 let (rect, _) = ui.allocate_at_least(Vec2::new(100.0, 100.0), Sense::hover());
                 ui.painter().rect_filled(rect, 0.0, *color);
                 let resp = ui.text_edit_singleline(hex);
-                if resp.changed() {
-                    if let Ok(new_color) = HexColor::from_str_without_hash(hex) {
-                        *color = new_color.color();
-                    }
+                if resp.changed()
+                    && let Ok(new_color) = HexColor::from_str_without_hash(hex)
+                {
+                    *color = new_color.color();
                 }
                 resp
             },
@@ -301,11 +301,11 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
 
         let mut delta = None;
         if self.arrows {
-            let arrow_left = res.rect.max.x + 4.0;
-            let arrow_right = res.rect.max.x + 20.0;
-            let arrow_top = res.rect.min.y - 2.0;
+            let arrow_left = res.rect.max.x - 16.0;
+            let arrow_right = res.rect.max.x;
+            let arrow_top = res.rect.min.y;
             let arrow_middle = (res.rect.min.y + res.rect.max.y) / 2.0;
-            let arrow_bottom = res.rect.max.y + 2.0;
+            let arrow_bottom = res.rect.max.y;
 
             let top_arrow_rect = Rect {
                 min: (arrow_left, arrow_top).into(),